Commit 51ed906d9d1f4a110d7a08eb8d29920bc0208393
Exists in
spb-stable
and in
3 other branches
Merge branch 'we-hate-options' into 'master'
We Hate Options
Showing
1 changed file
with
1 additions
and
1 deletions
Show diff stats
CONTRIBUTING.md
| @@ -84,7 +84,7 @@ We will accept a merge requests if it: | @@ -84,7 +84,7 @@ We will accept a merge requests if it: | ||
| 84 | * Fixes one specific issue or implements one specific feature (do not combine things, send separate merge requests if needed) | 84 | * Fixes one specific issue or implements one specific feature (do not combine things, send separate merge requests if needed) |
| 85 | * Keeps the GitLab code base clean and well structured | 85 | * Keeps the GitLab code base clean and well structured |
| 86 | * Contains functionality we think other users will benefit from too | 86 | * Contains functionality we think other users will benefit from too |
| 87 | -* Doesn't add avoidable configuration options since these complicate future changes | 87 | +* Doesn't add configuration options since these complicate future changes |
| 88 | * Contains a single commit (please use `git rebase -i` to squash commits) | 88 | * Contains a single commit (please use `git rebase -i` to squash commits) |
| 89 | 89 | ||
| 90 | 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). | 90 | 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). |