Download as
Browse Code »

Commit 9be05a430b312190dd884d9f6145bac7dd3e6485

Authored by Dmitriy Zaporozhets
2 parents 1069ffb8 a9af2e5d
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Merge branch 'master' of github.com:gitlabhq/gitlabhq

Showing 2 changed files with 5 additions and 4 deletions   Show diff stats
doc/README.md
  Diff comments   View file @9be05a4
... ... @@ -3,7 +3,7 @@
3 3 + [API](api/README.md)
4 4 + [Development](development/README.md)
5 5 + [Install](install/README.md)
6   -+ [Integration](external-issue-tracker/README.md)
  6 ++ [Integration](integration/external-issue-tracker.md)
7 7 + [Legal](legal/README.md)
8 8 + [Markdown](markdown/markdown.md)
9 9 + [Permissions](permissions/permissions.md)
... ...
doc/workflow/workflow.md
  Diff comments   View file @9be05a4
... ... @@ -3,24 +3,25 @@
3 3 ```bash
4 4 git clone git@example.com:project-name.git
5 5 ```
  6 +
6 7 2. Create branch with your feature
7 8  
8 9 ```bash
9 10 git checkout -b $feature_name
10 11 ```
11 12  
12   -3. Write code. Comit changes
  13 +3. Write code. Commit changes
13 14  
14 15 ```bash
15 16 git commit -am "My feature is ready"
16 17 ```
17 18  
18 19 4. Push your branch to GitLab
19   -
  20 +
20 21 ```bash
21 22 git push origin $feature_name
22 23 ```
23 24  
24   -5. Review your code on Commits page
  25 +5. Review your code on commits page
25 26 6. Create a merge request
26 27 7. Your team lead will review the code & merge it to the main branch
... ...