summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2016-09-02 13:39:29 +0000
committerFatih Acet <acetfatih@gmail.com>2016-09-02 13:39:29 +0000
commit5a7e027859a85e9ad0aba82fff52703b15140f38 (patch)
tree6212c4ffdefa6f0b2e67068fec34b12ad626c9cf
parenta5d1428a91c16f07b73cf62401f9513db5fb85b7 (diff)
parent88fe7c0f24d751e23ac02222305dbee6f128f6a1 (diff)
downloadgitlab-ce-issue_19734_js_fix.tar.gz
Merge branch 'fix-changelog' into 'master' issue_19734_js_fix
Move CHANGELOG entry for !5858 from 8.11 to 8.12 ## What does this MR do? Fix CHANGELOG entry of !5858 See merge request !6178
-rw-r--r--CHANGELOG2
1 files changed, 1 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 0eb076fd62f..c506c0b9272 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -47,6 +47,7 @@ v 8.12.0 (unreleased)
- Expire commit info views after one day, instead of two weeks, to allow for user email updates
- Add delimiter to project stars and forks count (ClemMakesApps)
- Fix badge count alignment (ClemMakesApps)
+ - Remove green outline from `New branch unavailable` button on issue page !5858 (winniehell)
- Fix repo title alignment (ClemMakesApps)
- Fix branch title trailing space on hover (ClemMakesApps)
- Award emoji tooltips containing more than 10 usernames are now truncated !4780 (jlogandavison)
@@ -126,7 +127,6 @@ v 8.11.0
- Add Issues Board !5548
- Allow resolving merge conflicts in the UI !5479
- Improve diff performance by eliminating redundant checks for text blobs
- - Remove green outline from `New branch unavailable` button on issue page !5858 (winniehell)
- Ensure that branch names containing escapable characters (e.g. %20) aren't unescaped indiscriminately. !5770 (ewiltshi)
- Convert switch icon into icon font (ClemMakesApps)
- API: Endpoints for enabling and disabling deploy keys