diff options
author | Douwe Maan <douwe@gitlab.com> | 2016-06-03 12:43:48 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2016-06-03 12:43:48 +0000 |
commit | ca3c5c295ed653b483fe81c3918ffe60f46666b9 (patch) | |
tree | 95a9655a3558caa05f4b9d35b7cc152932091378 | |
parent | 3c713de0c4a169ce64b3110aec85f9f0f382240a (diff) | |
parent | 7cc897d74e72367ac782eb7cd469f4c26acc3ef0 (diff) | |
download | gitlab-ce-ca3c5c295ed653b483fe81c3918ffe60f46666b9.tar.gz |
Merge branch 'patch-1' into 'master'
Let contributors know where to start
Needed becuase: https://gitlab.com/gitlab-org/gitlab-ce/issues/14905#note_12235996
See merge request !4455
-rw-r--r-- | CONTRIBUTING.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a15f8c4fec7..e952855fde1 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -308,7 +308,7 @@ tests are least likely to receive timely feedback. The workflow to make a merge request is as follows: 1. Fork the project into your personal space on GitLab.com -1. Create a feature branch +1. Create a feature branch, branch away from `master`. 1. Write [tests](https://gitlab.com/gitlab-org/gitlab-development-kit#running-the-tests) and code 1. Add your changes to the [CHANGELOG](CHANGELOG) 1. If you are writing documentation, make sure to read the [documentation styleguide][doc-styleguide] |