summaryrefslogtreecommitdiff
path: root/CONTRIBUTING.md
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2014-09-02 17:10:05 +0300
committerAchilleas Pipinellis <axilleas@axilleas.me>2014-09-02 17:12:01 +0300
commit966d4d85ef758af2c8858f6410388d64011d0b84 (patch)
tree6f5d1b63fb1f9fa9825059b9c69c88cdb3272b80 /CONTRIBUTING.md
parent1d04a6fda7e5768dfc71cdffd74ede8f924ec647 (diff)
downloadgitlab-ce-966d4d85ef758af2c8858f6410388d64011d0b84.tar.gz
Mention [skip ci] in CONTRIBUTING.md.
http://docs.travis-ci.com/user/how-to-skip-a-build/
Diffstat (limited to '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