diff options
author | Robert Speicher <robert@gitlab.com> | 2016-06-01 17:56:49 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2016-06-01 17:56:49 +0000 |
commit | 93e2761c896330d67077d68fd4de0f2e740b3786 (patch) | |
tree | 92993db6c2cfb8801c287579d80fa48bd455fc2b | |
parent | 3d3c9c75aa6078d3f3dcd8ba1399a0e6f64a26c1 (diff) | |
parent | ea80259b489a028513f096d50c99f31eaaaaf201 (diff) | |
download | gitlab-ce-93e2761c896330d67077d68fd4de0f2e740b3786.tar.gz |
Merge branch 'dont-advertise-ci-skip' into 'master'
Don't advertise the use of "ci skip" in the CONTRIBUTING guide
[ci skip]
See merge request !4406
-rw-r--r-- | CONTRIBUTING.md | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9fe4cf7b0f6..a15f8c4fec7 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -311,13 +311,11 @@ request is as follows: 1. Create a feature branch 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 changing the README, some documentation or other things which - have no effect on the tests, add `[ci skip]` somewhere in the commit message - and make sure to read the [documentation styleguide][doc-styleguide] +1. If you are writing documentation, make sure to read the [documentation styleguide][doc-styleguide] 1. If you have multiple commits please combine them into one commit by [squashing them][git-squash] 1. Push the commit(s) to your fork -1. Submit a merge request (MR) to the master branch +1. Submit a merge request (MR) to the `master` branch 1. The MR title should describe the change you want to make 1. The MR description should give a motive for your change and the method you used to achieve it, see the [merge request description format] |