summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYorick Peterse <yorickpeterse@gmail.com>2016-01-28 11:49:41 +0100
committerYorick Peterse <yorickpeterse@gmail.com>2016-02-02 10:52:47 +0100
commit9dfc4511ff1b8029ce8ad4e6c94bc0f39164b02d (patch)
tree71b83ffd3e2caec35cf567373cf886554595502d
parent7df149bb63c91792fb958db87b24bb120463a49e (diff)
downloadgitlab-ce-9dfc4511ff1b8029ce8ad4e6c94bc0f39164b02d.tar.gz
Updated contributing guide for stable releasescontributing-labels-stable-releases
Fixes #12784
-rw-r--r--CONTRIBUTING.md12
1 files changed, 12 insertions, 0 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index e7659b06c71..4130c57d472 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -257,6 +257,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