summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimothy Andrew <mail@timothyandrew.net>2016-07-04 11:07:37 +0530
committerTimothy Andrew <mail@timothyandrew.net>2016-07-13 13:24:56 +0530
commitdffdc7b27c1f89e4e26b4714834e4f147c656206 (patch)
tree37906ecb2c888edc8bc35e3fc0164c668616b981
parentaf7e75162efe07e9fcb1186462e56bd2325018de (diff)
downloadgitlab-ce-dffdc7b27c1f89e4e26b4714834e4f147c656206.tar.gz
Add "Developers can Merge" (to protected branches) to the CHANGELOG.
-rw-r--r--CHANGELOG2
1 files changed, 1 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index e144ba8513f..b0d86e4acad 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -43,6 +43,7 @@ v 8.10.0 (unreleased)
- Add "Enabled Git access protocols" to Application Settings
- Diffs will create button/diff form on demand no on server side
- Reduce size of HTML used by diff comment forms
+ - Protected branches have a "Developers can Merge" setting. !4892 (original implementation by Mathias Vestergaard)
- Fix user creation with stronger minimum password requirements !4054 (nathan-pmt)
- Only show New Snippet button to users that can create snippets.
- PipelinesFinder uses git cache data
@@ -497,7 +498,6 @@ v 8.7.7
- Prevent unauthorized access to other projects build traces
- Forbid scripting for wiki files
- Only show notes through JSON on confidential issues that the user has access to
- - Added protected branch setting that allows Developers to accept merge requests while push is still disallowed. !4220 (Mathias Vestergaard)
v 8.7.6
- Fix links on wiki pages for relative url setups. !4131 (Artem Sidorenko)