Merge branch 'no-options' of /home/git/repositories/gitlab/gitlabhq

Dmitriy Zaporozhets
2 parents 85a6fe4b 82aaa897
Showing 1 changed file with 11 additions and 10 deletions Show diff stats
CONTRIBUTING.md
@@ -69,15 +69,16 @@ If you can, please submit a merge request with the fix or improvements including
  
 Please keep the change in a single MR as small as possible. If you want to contribute a large feature think very hard what the minimum viable change is. Can you split functionality? Can you only submit the backend/API code? Can you start with a very simple UI? The smaller a MR is the more likely it is it will be merged, after that you can send more MR's to enhance it.
  
-We will accept merge requests if:
-
-* The code has proper tests and all tests pass (or it is a test exposing a failure in existing code)
-* It can be merged without problems (if not please use: `git rebase master`)
-* It does not break any existing functionality
-* It's quality code that conforms to the [Ruby](https://github.com/bbatsov/ruby-style-guide) and [Rails](https://github.com/bbatsov/rails-style-guide) style guides and best practices
-* It is not a catch all merge request but rather fixes a specific issue or implements a specific feature
-* It keeps the GitLab code base clean and well structured
-* We think other users will benefit from the same functionality
-* It is a single commit (please use `git rebase -i` to squash commits)
+We will accept a merge requests if it:
+
+* Includes proper tests and all tests pass (unless it contains a test exposing a bug in existing code)
+* Can be merged without problems (if not please use: `git rebase master`)
+* Do not break any existing functionality
+* Conforms to the [Ruby](https://github.com/bbatsov/ruby-style-guide) and [Rails](https://github.com/bbatsov/rails-style-guide) style guides and best practices
+* 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 unnessecary configuration options since they 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).
...	...	@@ -69,15 +69,16 @@ If you can, please submit a merge request with the fix or improvements including
69	69
70	70	Please keep the change in a single MR as small as possible. If you want to contribute a large feature think very hard what the minimum viable change is. Can you split functionality? Can you only submit the backend/API code? Can you start with a very simple UI? The smaller a MR is the more likely it is it will be merged, after that you can send more MR's to enhance it.
71	71
72		-We will accept merge requests if:
73		-
74		-* The code has proper tests and all tests pass (or it is a test exposing a failure in existing code)
75		-* It can be merged without problems (if not please use: `git rebase master`)
76		-* It does not break any existing functionality
77		-* It's quality code that conforms to the [Ruby](https://github.com/bbatsov/ruby-style-guide) and [Rails](https://github.com/bbatsov/rails-style-guide) style guides and best practices
78		-* It is not a catch all merge request but rather fixes a specific issue or implements a specific feature
79		-* It keeps the GitLab code base clean and well structured
80		-* We think other users will benefit from the same functionality
81		-* It is a single commit (please use `git rebase -i` to squash commits)
	72	+We will accept a merge requests if it:
	73	+
	74	+* Includes proper tests and all tests pass (unless it contains a test exposing a bug in existing code)
	75	+* Can be merged without problems (if not please use: `git rebase master`)
	76	+* Do not break any existing functionality
	77	+* Conforms to the [Ruby](https://github.com/bbatsov/ruby-style-guide) and [Rails](https://github.com/bbatsov/rails-style-guide) style guides and best practices
	78	+* Fixes one specific issue or implements one specific feature (do not combine things, send separate merge requests if needed)
	79	+* Keeps the GitLab code base clean and well structured
	80	+* Contains functionality we think other users will benefit from too
	81	+* Doesn't add unnessecary configuration options since they complicate future changes
	82	+* Contains a single commit (please use `git rebase -i` to squash commits)
82	83
83	84	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).
...	...