summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2016-08-25 14:06:48 -0500
committerRuben Davila <rdavila84@gmail.com>2016-08-25 16:10:53 -0500
commitabcafc38f12e37b4475b048249741b871c54e477 (patch)
tree64a00fa685a234a4c64a49054200385612cedc14
parentae5916567e90cb5392ff034ab7fc100abc80b61e (diff)
downloadgitlab-ce-abcafc38f12e37b4475b048249741b871c54e477.tar.gz
Fix changelog
-rw-r--r--CHANGELOG5
1 files changed, 1 insertions, 4 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 4da8845ad09..4a335f58594 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -19,11 +19,7 @@ v 8.12.0 (unreleased)
v 8.11.3 (unreleased)
- Allow system info page to handle case where info is unavailable
-
-v 8.11.3 (unreleased)
- Label list shows all issues (opened or closed) with that label
-
-v 8.11.2
- 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
@@ -31,6 +27,7 @@ v 8.11.3 (unreleased)
- Don't try to show merge conflict resolution info if a merge conflict contains non-UTF-8 characters
v 8.11.2 (unreleased)
+v 8.11.2
- Show "Create Merge Request" widget for push events to fork projects on the source project
v 8.11.1