summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcia Ramos <marcia@gitlab.com>2019-03-29 17:42:28 +0000
committerMarcia Ramos <marcia@gitlab.com>2019-03-29 17:42:28 +0000
commit0df75d241a5054a19086dca29cca4d65ac1736fe (patch)
tree74ac2497c85ea86fc09ca8e694532d0adf4ba907
parentb4cc639f80407285e69bdb5cb2bda7dcd74c87e6 (diff)
parent7f9ef2a585ffec746d0392f3edb2068bbb9c57b1 (diff)
downloadgitlab-ce-0df75d241a5054a19086dca29cca4d65ac1736fe.tar.gz
Merge branch 'update-contribution-closing-policy' into 'master'
Update contribution closing policy See merge request gitlab-org/gitlab-ce!26728
-rw-r--r--doc/development/contributing/index.md7
1 files changed, 5 insertions, 2 deletions
diff --git a/doc/development/contributing/index.md b/doc/development/contributing/index.md
index bfe1ef75914..b39c302453b 100644
--- a/doc/development/contributing/index.md
+++ b/doc/development/contributing/index.md
@@ -52,9 +52,12 @@ for audiences of all ages.
If a contributor is no longer actively working on a submitted merge request
we can decide that the merge request will be finished by one of our
[Merge request coaches][team] or close the merge request. We make this decision
-based on how important the change is for our product vision. If a Merge request
+based on how important the change is for our product vision. If a merge request
coach is going to finish the merge request we assign the
-~"coach will finish" label.
+~"coach will finish" label. When a team member picks up a community contribution,
+we credit the original author by adding a changelog entry crediting the author
+and optionally include the original author on at least one of the commits
+within the MR.
## Helping others