summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-02-11 09:02:46 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-02-11 09:02:46 +0000
commit51ed906d9d1f4a110d7a08eb8d29920bc0208393 (patch)
tree231e222976d30fd02deb56d81373ffbd13717881
parentfaafde2d2b8dc3457c45aa87e6dd280bfdd13dde (diff)
parent41adbc0b944501501f7334691cd9d10b21a7fe27 (diff)
downloadgitlab-ce-51ed906d9d1f4a110d7a08eb8d29920bc0208393.tar.gz
Merge branch 'we-hate-options' into 'master'
We Hate Options
-rw-r--r--CONTRIBUTING.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 0a97faaf301..cf52808b74b 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -84,7 +84,7 @@ We will accept a merge requests if it:
* Fixes one specific issue or implements one specific feature (do not combine things, send separate merge requests if needed)
* Keeps the GitLab code base clean and well structured
* Contains functionality we think other users will benefit from too
-* Doesn't add avoidable configuration options since these complicate future changes
+* Doesn't add configuration options since these complicate future changes
* Contains a single commit (please use `git rebase -i` to squash commits)
For examples of feedback on merge requests please look at already [closed merge requests](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests?assignee_id=&label_name=&milestone_id=&scope=&sort=&state=closed).