Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Release Tools Bot <robert+release-tools@gitlab.com>2019-01-17 06:35:43 +0300
committerGitLab Release Tools Bot <robert+release-tools@gitlab.com>2019-01-17 06:35:43 +0300
commit578660411824283277d5f1bb924d4ef033354aa9 (patch)
treeb80e61add34eecf59751c346c7f5ff07bfd81363
parenta080d5ffdcd0c9ef8d457d97429c19d67ee95a9f (diff)
Update CHANGELOG.md for 11.6.5
[ci skip]
-rw-r--r--CHANGELOG.md11
-rw-r--r--changelogs/unreleased/55945-suggested-change-highlight.yml5
-rw-r--r--changelogs/unreleased/sh-fix-gon-helper-avatar.yml5
-rw-r--r--changelogs/unreleased/sh-fix-real-size-warnings.yml5
-rw-r--r--changelogs/unreleased/sh-fix-request-profiles-html.yml5
-rw-r--r--changelogs/unreleased/suggestion-dashes.yml5
6 files changed, 11 insertions, 25 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9be6c68c6ce..9939f36ad0d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,17 @@
documentation](doc/development/changelog.md) for instructions on adding your own
entry.
+## 11.6.5 (2019-01-17)
+
+### Fixed (5 changes)
+
+- Add syntax highlighting to suggestion diff. !24156
+- Fix broken templated "Too many changes to show" text. !24282
+- Fix requests profiler in admin page not rendering HTML properly. !24291
+- Fix no avatar not showing in user selection box. !24346
+- Fixed diff suggestions removing dashes.
+
+
## 11.6.4 (2019-01-15)
### Security (1 change)
diff --git a/changelogs/unreleased/55945-suggested-change-highlight.yml b/changelogs/unreleased/55945-suggested-change-highlight.yml
deleted file mode 100644
index 611854d36ab..00000000000
--- a/changelogs/unreleased/55945-suggested-change-highlight.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add syntax highlighting to suggestion diff
-merge_request: 24156
-author:
-type: fixed
diff --git a/changelogs/unreleased/sh-fix-gon-helper-avatar.yml b/changelogs/unreleased/sh-fix-gon-helper-avatar.yml
deleted file mode 100644
index c83273608ad..00000000000
--- a/changelogs/unreleased/sh-fix-gon-helper-avatar.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix no avatar not showing in user selection box
-merge_request: 24346
-author:
-type: fixed
diff --git a/changelogs/unreleased/sh-fix-real-size-warnings.yml b/changelogs/unreleased/sh-fix-real-size-warnings.yml
deleted file mode 100644
index 5062ffd677c..00000000000
--- a/changelogs/unreleased/sh-fix-real-size-warnings.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix broken templated "Too many changes to show" text
-merge_request: 24282
-author:
-type: fixed
diff --git a/changelogs/unreleased/sh-fix-request-profiles-html.yml b/changelogs/unreleased/sh-fix-request-profiles-html.yml
deleted file mode 100644
index 74e4115db8e..00000000000
--- a/changelogs/unreleased/sh-fix-request-profiles-html.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix requests profiler in admin page not rendering HTML properly
-merge_request: 24291
-author:
-type: fixed
diff --git a/changelogs/unreleased/suggestion-dashes.yml b/changelogs/unreleased/suggestion-dashes.yml
deleted file mode 100644
index e99ab30b263..00000000000
--- a/changelogs/unreleased/suggestion-dashes.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fixed diff suggestions removing dashes
-merge_request:
-author:
-type: fixed