summaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2016-05-20 21:41:02 +0000
committerDouwe Maan <douwe@gitlab.com>2016-05-20 21:41:02 +0000
commitbaccd1838c92a0d38d3f38b93e9911c97adfef21 (patch)
tree23e42bfa3f6c30d01aee84f2a8cc6cca2d2eba6f /CHANGELOG
parentfc1910ddc5db25e608921f69c3dc28d830e6ea03 (diff)
parent7880a300dc9ef3fcceb7f1a6af6a6500b0b46e5c (diff)
downloadgitlab-ce-baccd1838c92a0d38d3f38b93e9911c97adfef21.tar.gz
Merge branch 'rm-source-branch' into 'master'
Allows MR authors to have the source branch removed when merging the MR closes #13191 The location of the checkbox might not be optimal so any feedback is welcome. Any other feedback too obviously. Screenshot: ![Screenshot_2016-02-17_21.25.24](/uploads/a9c3eaafb39c6f5b4f0949a2278af6da/Screenshot_2016-02-17_21.25.24.png) See merge request !2801
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG1
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 470813fb9e9..47cb35745ab 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -70,6 +70,7 @@ v 8.8.0 (unreleased)
- All Grape API helpers are now instrumented
- Improve Issue formatting for the Slack Service (Jeroen van Baarsen)
- Fixed advice on invalid permissions on upload path !2948 (Ludovic Perrine)
+ - Allows MR authors to have the source branch removed when merging the MR. !2801 (Jeroen Jacobs)
v 8.7.6
- Fix links on wiki pages for relative url setups. !4131 (Artem Sidorenko)