summaryrefslogtreecommitdiff
path: root/CONTRIBUTING.md
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-02-02 15:53:58 +0000
committerRobert Speicher <robert@gitlab.com>2016-02-02 15:53:58 +0000
commitb77cc8a1336a434c73de10f049bff35f3081e79c (patch)
treefc7ad62162e515541e61f8db395564c73788f2b8 /CONTRIBUTING.md
parent53726415388352eb5a71854054cf065377368538 (diff)
parent9dfc4511ff1b8029ce8ad4e6c94bc0f39164b02d (diff)
downloadgitlab-ce-b77cc8a1336a434c73de10f049bff35f3081e79c.tar.gz
Merge branch 'contributing-labels-stable-releases' into 'master'
Updated contributing guide for stable releases [ci skip] See merge request !2638
Diffstat (limited to 'CONTRIBUTING.md')
-rw-r--r--CONTRIBUTING.md12
1 files changed, 12 insertions, 0 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 7235ab4a83d..a7a2307492f 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -277,6 +277,18 @@ Please ensure that your merge request meets the contribution acceptance criteria
When having your code reviewed and when reviewing merge requests please take the [thoughtbot code review guidelines](https://github.com/thoughtbot/guides/tree/master/code-review) into account.
+## Changes for Stable Releases
+
+Sometimes certain changes have to be added to an existing stable release.
+Two examples are bug fixes and performance improvements. In these cases the
+corresponding merge request should be updated to have the following:
+
+1. A milestone indicating what release the merge request should be merged into.
+1. The label "Pick into Stable"
+
+This makes it easier for release managers to keep track of what still has to be
+merged and where changes have to be merged into.
+
## Definition of done
If you contribute to GitLab please know that changes involve more than just