summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose Ivan Vargas <jvargas@gitlab.com>2017-09-29 12:05:14 -0500
committerJose Ivan Vargas <jvargas@gitlab.com>2017-09-29 12:05:14 -0500
commitb65705b03b4f575b7a2aa1601d88bf971634821d (patch)
tree1fcabfdfc18ab0126e43f08a550c46ba829c4941
parent3a429e0f5ad76d5d2f2a4932253130314a8a2044 (diff)
downloadgitlab-ce-b65705b03b4f575b7a2aa1601d88bf971634821d.tar.gz
Update CHANGELOG.md for 9.5.6
[ci skip]
-rw-r--r--CHANGELOG.md7
-rw-r--r--changelogs/unreleased/33287-fix-mr-widget-errors-with-external-services.yml5
-rw-r--r--changelogs/unreleased/37259-some-mr-ready-mobile-fixes.yml5
-rw-r--r--changelogs/unreleased/37465-fix-line-resolve-all-green-checkmark-icon.yml6
-rw-r--r--changelogs/unreleased/38319-nomethoderror-undefined-method-sha-for-nil-nilclass.yml5
5 files changed, 7 insertions, 21 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c58359cb885..842b8d11a3e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,13 @@
documentation](doc/development/changelog.md) for instructions on adding your own
entry.
+## 9.5.6 (2017-09-29)
+
+- [FIXED] Fix MR ready to merge buttons/controls at mobile breakpoint. !14242
+- [FIXED] Fix errors thrown in merge request widget with external CI service/integration.
+- [FIXED] Update x/x discussions resolved checkmark icon to be green when all discussions resolved.
+- [FIXED] Fix 500 error on merged merge requests when GitLab is restored from a backup.
+
## 9.5.5 (2017-09-18)
- [SECURITY] Upgrade mail and nokogiri gems due to security issues. !13662 (Markus Koller)
diff --git a/changelogs/unreleased/33287-fix-mr-widget-errors-with-external-services.yml b/changelogs/unreleased/33287-fix-mr-widget-errors-with-external-services.yml
deleted file mode 100644
index f0c76060781..00000000000
--- a/changelogs/unreleased/33287-fix-mr-widget-errors-with-external-services.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix errors thrown in merge request widget with external CI service/integration
-merge_request:
-author:
-type: fixed
diff --git a/changelogs/unreleased/37259-some-mr-ready-mobile-fixes.yml b/changelogs/unreleased/37259-some-mr-ready-mobile-fixes.yml
deleted file mode 100644
index a00a41f567f..00000000000
--- a/changelogs/unreleased/37259-some-mr-ready-mobile-fixes.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix MR ready to merge buttons/controls at mobile breakpoint
-merge_request: 14242
-author:
-type: fixed
diff --git a/changelogs/unreleased/37465-fix-line-resolve-all-green-checkmark-icon.yml b/changelogs/unreleased/37465-fix-line-resolve-all-green-checkmark-icon.yml
deleted file mode 100644
index 24b1d201409..00000000000
--- a/changelogs/unreleased/37465-fix-line-resolve-all-green-checkmark-icon.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Update x/x discussions resolved checkmark icon to be green when all discussions
- resolved
-merge_request:
-author:
-type: fixed
diff --git a/changelogs/unreleased/38319-nomethoderror-undefined-method-sha-for-nil-nilclass.yml b/changelogs/unreleased/38319-nomethoderror-undefined-method-sha-for-nil-nilclass.yml
deleted file mode 100644
index f3c39827590..00000000000
--- a/changelogs/unreleased/38319-nomethoderror-undefined-method-sha-for-nil-nilclass.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix 500 error on merged merge requests when GitLab is restored from a backup
-merge_request:
-author:
-type: fixed