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

CONTRIBUTING.md

@@ -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. Create a feature branch
 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 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

doc/workflow/README.md

@@ -3,3 +3,4 @@
 - [Authorization for merge requests](authorization_for_merge_requests.md)
 - [Groups](groups.md)
 - [Labels](labels.md)
+- [GitLab Flow](gitlab_flow.md)