Download as
Browse Code »

Commit def67592b4d3f15d404cba1c4f5bc0faef315629

Authored by Ciro Santilli
1 parent 731c009a
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Say issues are accepted at both gitlab and github.

Showing 1 changed file with 4 additions and 0 deletions   Show diff stats
CONTRIBUTING.md
  Diff comments   View file @def6759
@@ -29,6 +29,8 @@ If something is wrong but it is not a regression compared to older versions of G @@ -29,6 +29,8 @@ If something is wrong but it is not a regression compared to older versions of G
29 When submitting an issue please conform to the issue submission guidelines listed below. 29 When submitting an issue please conform to the issue submission guidelines listed below.
30 Not all issues will be addressed and your issue is more likely to be addressed if you submit a merge request which partially or fully addresses the issue. 30 Not all issues will be addressed and your issue is more likely to be addressed if you submit a merge request which partially or fully addresses the issue.
31 31
  32 +Issues can be filed either at [gitlab.com](https://gitlab.com/gitlab-org/gitlab-ce/issues) or [github.com](https://github.com/gitlabhq/gitlabhq/issues).
  33 +
32 Do not use the issue tracker for feature requests. 34 Do not use the issue tracker for feature requests.
33 We have a specific [feature request forum](http://feedback.gitlab.com) for this purpose. 35 We have a specific [feature request forum](http://feedback.gitlab.com) for this purpose.
34 Please keep feature requests as small and simple as possible, complex ones might be edited to make them small and simple. 36 Please keep feature requests as small and simple as possible, complex ones might be edited to make them small and simple.
@@ -55,6 +57,8 @@ Please send a merge request with a tested solution or a merge request with a fai @@ -55,6 +57,8 @@ Please send a merge request with a tested solution or a merge request with a fai
55 57
56 We welcome merge requests with fixes and improvements to GitLab code, tests, and/or documentation. The features we would really like a merge request for are listed with the [status 'accepting merge requests' on our feature request forum](http://feedback.gitlab.com/forums/176466-general/status/796455) but other improvements are also welcome. If you want to add a new feature that is not marked it is best to first create a feedback issue (if there isn't one already) and leave a comment asking for it to be marked accepting merge requests. Please include screenshots or wireframes if the feature will also change the UI. 58 We welcome merge requests with fixes and improvements to GitLab code, tests, and/or documentation. The features we would really like a merge request for are listed with the [status 'accepting merge requests' on our feature request forum](http://feedback.gitlab.com/forums/176466-general/status/796455) but other improvements are also welcome. If you want to add a new feature that is not marked it is best to first create a feedback issue (if there isn't one already) and leave a comment asking for it to be marked accepting merge requests. Please include screenshots or wireframes if the feature will also change the UI.
57 59
  60 +Merge requests can be filed either at [gitlab.com](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests) or [github.com](https://github.com/gitlabhq/gitlabhq/pulls).
  61 +
58 ### Merge request guidelines 62 ### Merge request guidelines
59 63
60 If you can, please submit a merge request with the fix or improvements including tests. If you don't know how to fix the issue but can write a test that exposes the issue we will accept that as well. In general bug fixes that include a regression test are merged quickly while new features without proper tests are least likely to receive timely feedback. The workflow to make a merge request is as follows: 64 If you can, please submit a merge request with the fix or improvements including tests. If you don't know how to fix the issue but can write a test that exposes the issue we will accept that as well. In general bug fixes that include a regression test are merged quickly while new features without proper tests are least likely to receive timely feedback. The workflow to make a merge request is as follows: