Commit e7087fbfc4146d52fdac8a73e6c3157c3aa57cfa

Authored by Dmitriy Zaporozhets
2 parents 3b339a8b 603fa9e9

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq

Showing 1 changed file with 15 additions and 16 deletions   Show diff stats
PROCESS.md
... ... @@ -7,24 +7,19 @@ Below we describe the contributing process to GitLab for two reasons. So that co
7 7 ## Common actions
8 8  
9 9 ### Issue team
10   -- Looks for issues without workflow labels and triages issue
11   -- Monitors merge requests
12   -- Closes invalid issues and merge requests with a comment (duplicates, [feature requests](#feature-requests), [fixed in newer version](#issue-fixed-in-newer-version), [issue report for old version](#issue-report-for-old-version), not a problem in GitLab, etc.)
13   -- Assigns appropriate [labels](#how-we-handle-issues)
14   -- Asks for feedback from issue reporter/merge request initiator ([invalid issue reports](#improperly-formatted-issue), [format code](#code-format), etc.)
15   -- Asks for feedback from the relevant developer(s) based on the [list of members and their specialities](https://www.gitlab.com/core-team/)
16   -- Monitors all issues/merge requests for feedback (but especially ones commented on since automatically watching them):
  10 +- Looks for issues without [workflow labels](#how-we-handle-issues) and triages issue
  11 +- Closes invalid issues with a comment (duplicates, [feature requests](#feature-requests), [fixed in newer version](#issue-fixed-in-newer-version), [issue report for old version](#issue-report-for-old-version), not a problem in GitLab, etc.)
  12 +- Asks for feedback from issue reporter ([invalid issue reports](#improperly-formatted-issue), [format code](#code-format), etc.)
  13 +- Monitors all issues for feedback (but especially ones commented on since automatically watching them)
17 14 - Closes issues with no feedback from the reporter for two weeks
18   -- Closes stale merge requests
19 15  
20   -### Development team
  16 +### Merge request officers
21 17  
22   -- Responds to issues and merge requests the issue team mentions them in
23   -- Monitors for new issues in _Awaiting developer action/feedback_ with no developer activity (once a week)
24   -- Monitors for new merge requests (at least once a week)
25   -- Manages their work queue by looking at issues and merge requests assigned to them
26   -- Close fixed issues (via commit messages or manually)
27   -- Be kind to people trying to contribute. Be aware that people can be a non-native or a native English speaker, they might not understand thing or they might be very sensitive to how your word things. Use emoji to express your feelings (heart, star, smile, etc.). Some good tips about giving feedback to merge requests is in the [Thoughtbot code review guide](https://github.com/thoughtbot/guides/tree/master/code-review).
  18 +- Responds to merge requests the issue team mentions them in and monitors for new merge requests
  19 +- Provides feedback to the merge request submitter to improve the merge request (style, tests, etc.)
  20 +- Mark merge requests 'ready-for-merge' when they meet the contribution guidelines
  21 +- Mention developer(s) based on the [list of members and their specialities](https://www.gitlab.com/core-team/)
  22 +- Closes merge requests with no feedback from the reporter for two weeks
28 23  
29 24 ## Priorities of the issue team
30 25  
... ... @@ -63,6 +58,10 @@ If an issue is complex and needs the attention of a specific person, assignment
63 58 - Feature request (see copy & paste response: [Feature requests](#feature-requests))
64 59 - Support (see copy & paste response: [Support requests and configuration questions](#support-requests-and-configuration-questions)
65 60  
  61 +## Be kind
  62 +
  63 +Be kind to people trying to contribute. Be aware that people can be a non-native or a native English speaker, they might not understand thing or they might be very sensitive to how your word things. Use emoji to express your feelings (heart, star, smile, etc.). Some good tips about giving feedback to merge requests is in the [Thoughtbot code review guide](https://github.com/thoughtbot/guides/tree/master/code-review).
  64 +
66 65 ## Copy & paste responses
67 66  
68 67 ### Improperly formatted issue
... ... @@ -79,7 +78,7 @@ Thanks for the issue report but we only support issues for the latest stable ver
79 78  
80 79 ### Support requests and configuration questions
81 80  
82   -Thanks for your interest in GitLab. We don't use the issue tracker for support requests and configuration questions. Please use the \[support forum\]\(https://groups.google.com/forum/#!forum/gitlabhq), \[Stack Overflow\]\(http://stackoverflow.com/questions/tagged/gitlab), the unofficial #gitlab IRC channel on Freenode or the http://www.gitlab.com paid services for this purpose. Have a look at the \[contribution guidelines\]\(https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md) for more information.
  81 +Thanks for your interest in GitLab. We don't use the issue tracker for support requests and configuration questions. Please use the \[support forum\]\(https://groups.google.com/forum/#!forum/gitlabhq), \[Stack Overflow\]\(http://stackoverflow.com/questions/tagged/gitlab), the #gitlab IRC channel on Freenode or the http://www.gitlab.com paid services for this purpose. Have a look at the \[contribution guidelines\]\(https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md) for more information.
83 82  
84 83 ### Code format
85 84  
... ...