diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-09-24 13:49:45 +0300 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-09-24 13:49:45 +0300 |
| commit | 513629f3467a740231fa531637f3577c41f8d1bf (patch) | |
| tree | 70e92c1b80f2663525dbbc19ab38e994020245a9 /CHANGELOG | |
| parent | d4007fd4a618bad42aa187be9b7a0e9cc22aa006 (diff) | |
| parent | 8499de19c9bca4c43378b8a9cf2b6705f9cab647 (diff) | |
Merge branch 'gitlab-ce-milestone-tab-badges' into 'master'
Milestone tab badges
### What does this MR do?
Adds count badges to the tabs on the Milestone page to mirror the Issue page.
### Are there points in the code the reviewer needs to double check?
CSS: Padding was added to the `.milestone` element to make expired milestones look good.
### Why was this MR needed?
For consistency with other tabs
### What are the relevant issue numbers?
Closes #20114
### Screenshots (if relevant)
**Before**
<img src="/uploads/1f75853a863a9058ee409916b7ee4057/Screen_Shot_2016-07-22_at_13.22.20.png" width="362">
**After**
<img src="/uploads/8a058290850f571db249dd9b23f5138d/Screen_Shot_2016-07-22_at_13.21.58.png" width="303">
### Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [x] Added for this feature/bug
- [x] All builds are passing
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !5946
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 3394a6bdf05..1ebed18ebb4 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -87,6 +87,7 @@ v 8.12.0 - Fix markdown anchor icon interaction (ClemMakesApps) - Test migration paths from 8.5 until current release !4874 - Replace animateEmoji timeout with eventListener (ClemMakesApps) + - Show badges in Milestone tabs. !5946 (Dan Rowden) - Optimistic locking for Issues and Merge Requests (title and description overriding prevention) - Require confirmation when not logged in for unsubscribe links !6223 (Maximiliano Perez Coto) - Add `wiki_page_events` to project hook APIs (Ben Boeckel) |