Merge 'dev/master' into integrate-dev-master

54612d13 · Ruben Davila · 9304acc3 · c1c9895c · 54612d13 · 9304acc3
Commit 54612d13 authored Feb 07, 2017 by Ruben Davila
Showing with 4 additions and 4 deletions

CHANGELOG-EE.md CHANGELOG-EE.md +4 -0

changelogs/unreleased-ee/1595-merge-when-pipeline-succeeds-visible-if-approvals-are-pending.yml ...en-pipeline-succeeds-visible-if-approvals-are-pending.yml +0 -4

No files found.
--- a/CHANGELOG-EE.md
+++ b/CHANGELOG-EE.md
 Please view this file on the master branch, on stable branches it's out of date.
+## 8.16.4 (2017-02-02)
+- Disable all merge acceptance buttons pending MR approval.
 ## 8.16.3 (2017-01-27)
 - Fix sidekiq cluster mishandling of queue names. !1117

--- a/changelogs/unreleased-ee/1595-merge-when-pipeline-succeeds-visible-if-approvals-are-pending.yml
+++ b/changelogs/unreleased-ee/1595-merge-when-pipeline-succeeds-visible-if-approvals-are-pending.yml
---
-title: Disable all merge acceptance buttons pending MR approval.
-merge_request: !1101
-author: