diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-09-05 15:33:33 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-09-05 15:33:33 +0000 |
| commit | 553180e1c87664aae3efba01c30a345a1a2a2a00 (patch) | |
| tree | 1dece50fb5623d8d74bf0b79f537332ea850ab45 | |
| parent | 8aa025bb85cab3070a876b43d9c5462af5f35e67 (diff) | |
| parent | 9dff647a7bc181706d1e9d46d1ebfd5fb964dcf7 (diff) | |
| download | gitlab-ce-553180e1c87664aae3efba01c30a345a1a2a2a00.tar.gz | |
Merge branch 'fix-changelog' into 'master'
Move CHANGELOG entries of !5361, !5451 and !5887 from 8.11 to 8.12
## What does this MR do?
Move CHANGELOG entries of !5361, !5451 and !5887 from 8.11 to 8.12
## Why was this MR needed?
They were wrongly added to 8.11 here:
- https://gitlab.com/gitlab-org/gitlab-ce/commit/220755f52ad6e3fdfa43c62e0a4a4051721246dc#note_14900001
- https://gitlab.com/gitlab-org/gitlab-ce/commit/87f93ceb9542c415d6c23c72ff93d63272107d54
See merge request !6189
| -rw-r--r-- | CHANGELOG | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG index bc18171d091..3f52fab74d7 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -38,6 +38,9 @@ v 8.12.0 (unreleased) - Fix groups sort dropdown alignment (ClemMakesApps) - Add horizontal scrolling to all sub-navs on mobile viewports (ClemMakesApps) - Use JavaScript tooltips for mentions !5301 (winniehell) + - Add hover state to todos !5361 (winniehell) + - Fix icon alignment of star and fork buttons !5451 (winniehell) + - Fix alignment of icon buttons !5887 (winniehell) - Fix markdown help references (ClemMakesApps) - Add last commit time to repo view (ClemMakesApps) - Fix accessibility and visibility of project list dropdown button !6140 @@ -185,9 +188,6 @@ v 8.11.0 - Update `timeago` plugin to use multiple string/locale settings - Remove unused images (ClemMakesApps) - Get issue and merge request description templates from repositories - - Add hover state to todos !5361 (winniehell) - - Fix icon alignment of star and fork buttons !5451 (winniehell) - - Fix alignment of icon buttons !5887 (winniehell) - Enforce 2FA restrictions on API authentication endpoints !5820 - Limit git rev-list output count to one in forced push check - Show deployment status on merge requests with external URLs |