Merge branch 'contributing-expectations' of /home/git/repositories/gitlab/gitlabhq

Dmitriy Zaporozhets
2 parents a638a8df 0f8c36b8
Showing 1 changed file with 3 additions and 2 deletions Show diff stats
CONTRIBUTING.md
@@ -63,8 +63,9 @@ If you can, please submit a merge request with the fix or improvements including
 1. Submit a merge request (MR)
 1. The MR title should describes the change you want to make
 1. The MR description should give a motive for your change and the method you used to achieve it
-* If the MR changes the UI it should include before and after screenshots
-1. [Search for issues](https://gitlab.com/gitlab-org/gitlab-ce/issues) related to your merge request and mention them in the merge request description
+1. If the MR changes the UI it should include before and after screenshots
+1. Link relevant [issues](https://gitlab.com/gitlab-org/gitlab-ce/issues) and/or [feedback items](http://feedback.gitlab.com/) from the merge request description and leave a comment on them with a link back to the MR
+1. Be prepared to answer questions and incorporate feedback even if requests for this arrive weeks or months after your MR submittion
  
 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.
...	...	@@ -63,8 +63,9 @@ If you can, please submit a merge request with the fix or improvements including
63	63	1. Submit a merge request (MR)
64	64	1. The MR title should describes the change you want to make
65	65	1. The MR description should give a motive for your change and the method you used to achieve it
66		-* If the MR changes the UI it should include before and after screenshots
67		-1. [Search for issues](https://gitlab.com/gitlab-org/gitlab-ce/issues) related to your merge request and mention them in the merge request description
	66	+1. If the MR changes the UI it should include before and after screenshots
	67	+1. Link relevant [issues](https://gitlab.com/gitlab-org/gitlab-ce/issues) and/or [feedback items](http://feedback.gitlab.com/) from the merge request description and leave a comment on them with a link back to the MR
	68	+1. Be prepared to answer questions and incorporate feedback even if requests for this arrive weeks or months after your MR submittion
68	69
69	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.
70	71
...	...