summaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
authorMathias Vestergaard <mathias.vestergaard@gmail.com>2016-05-20 01:58:34 +0200
committerTimothy Andrew <mail@timothyandrew.net>2016-07-13 13:24:26 +0530
commitf0577d838544152f558411ef1101d56c5852d92e (patch)
tree5c2a60db094b4cf570e90bd97db0219cdd353ef5 /CHANGELOG
parentecd301ddf618488a2b54827b44f9017f89b3d27d (diff)
downloadgitlab-ce-f0577d838544152f558411ef1101d56c5852d92e.tar.gz
Added "developers can merge" setting to protected branches
- Cherry-picked from `mvestergaard:branch-protection-dev-merge` - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4220
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG1
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index f1dcc40a273..e144ba8513f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -497,6 +497,7 @@ 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)