summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSytse Sijbrandij <sytses@gmail.com>2014-09-02 16:35:18 +0200
committerSytse Sijbrandij <sytses@gmail.com>2014-09-02 16:35:18 +0200
commit00ccaed029efbbdff96a4b64628a3a2d9bf5125d (patch)
tree151fa14815a710f13e94785efdbf13509b9ec875
parent20c2e90222ac0b12a4cc3fb9b9455232f6e250ae (diff)
parent966d4d85ef758af2c8858f6410388d64011d0b84 (diff)
downloadgitlab-ce-00ccaed029efbbdff96a4b64628a3a2d9bf5125d.tar.gz
Merge pull request #7674 from axilleas/skip_ci
Mention [skip ci] in CONTRIBUTING.md.
-rw-r--r--CONTRIBUTING.md1
1 files changed, 1 insertions, 0 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f02ba2216d2..845be6e482b 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -62,6 +62,7 @@ If you can, please submit a merge request with the fix or improvements including
1. Create a feature branch
1. Write [tests](README.md#run-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
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. Submit a merge request (MR) to the master branch