Commit cc778b0a authored by Sytse Sijbrandij's avatar Sytse Sijbrandij

Merge branch 'gitlab-flow' into 'master'

Gitlab flow

This article describes the best practices we use at GitLab B.V.
This is still a draft, please comment and submit improvements.

See merge request !176
parents 2ebd2d41 15f01b6a
No related merge requests found
...@@ -61,7 +61,7 @@ If you can, please submit a merge request with the fix or improvements including ...@@ -61,7 +61,7 @@ If you can, please submit a merge request with the fix or improvements including
1. Fork the project on GitLab Cloud 1. Fork the project on GitLab Cloud
1. Create a feature branch 1. Create a feature branch
1. Write [tests](README.md#run-the-tests) and code 1. Write [tests](README.md#run-the-tests) and code
1. Add your changes to the [CHANGELOG](CHANGELOG) 1. Add your changes to the [CHANGELOG](CHANGELOG) insert your line at a [random point](doc/workflow/gitlab_flow.md#do-not-order-commits-with-rebase) in the current version
1. If you are changing the README, some documentation or other things which have no effect on the tests, add `[ci skip]` somewhere in the commit message 1. If you are changing the README, some documentation or other things which have no effect on the tests, add `[ci skip]` somewhere in the commit message
1. If you have multiple commits please combine them into one commit by [squashing them](http://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) 1. If you have multiple commits please combine them into one commit by [squashing them](http://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
1. Push the commit to your fork 1. Push the commit to your fork
......
...@@ -3,3 +3,4 @@ ...@@ -3,3 +3,4 @@
- [Authorization for merge requests](authorization_for_merge_requests.md) - [Authorization for merge requests](authorization_for_merge_requests.md)
- [Groups](groups.md) - [Groups](groups.md)
- [Labels](labels.md) - [Labels](labels.md)
- [GitLab Flow](gitlab_flow.md)
doc/workflow/ci_mr.png

39.1 KB

doc/workflow/close_issue_mr.png

143 KB

doc/workflow/environment_branches.png

39.3 KB

doc/workflow/git_pull.png

163 KB

doc/workflow/github_flow.png

20.1 KB

This diff is collapsed.
doc/workflow/good_commit.png

27.8 KB

doc/workflow/merge_commits.png

40.5 KB

doc/workflow/merge_request.png

166 KB

doc/workflow/mr_inline_comments.png

189 KB

doc/workflow/production_branch.png

21.2 KB

doc/workflow/rebase.png

120 KB

doc/workflow/release_branches.png

43.1 KB

doc/workflow/remove_checkbox.png

21.8 KB

doc/workflow/voting_slider.png

5.2 KB

Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment