summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean McGivern <sean@gitlab.com>2016-08-25 12:36:06 +0100
committerSean McGivern <sean@gitlab.com>2016-08-25 12:47:12 +0100
commit0d0d46dce2a933f0060b2b05216e53197a3d449b (patch)
tree6d4af03281858e54f32f0ce6914e5ea231155c31
parent67beaf6fb989e4f7981769b1f01bf383fc0de652 (diff)
downloadgitlab-ce-21275-getting-500-error-when-viewing-a-merge-request.tar.gz
-rw-r--r--CHANGELOG4
1 files changed, 4 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 518e80a360a..9a7753d691c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -10,6 +10,10 @@ v 8.12.0 (unreleased)
- Added tests for diff notes
- Added 'only_allow_merge_if_build_succeeds' project setting in the API. !5930 (Duck)
+v 8.11.3 (unreleased)
+ - Don't show resolve conflicts link before MR status is updated
+ - Don't prevent viewing the MR when git refs for conflicts can't be found on disk
+
v 8.11.2 (unreleased)
- Show "Create Merge Request" widget for push events to fork projects on the source project