diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-10-21 15:11:04 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-10-21 15:11:04 +0000 |
| commit | 4b2cc8dc96b0f7f8c0a7edf345bc4c3d0b0932e6 (patch) | |
| tree | 1fa99af371eda0f02900a44506b59b52b3c1d63f /CHANGELOG.md | |
| parent | 0ba365f745d3be3b02c6297ec72b60aa467e3f9a (diff) | |
| parent | 1c668b125e8fd3e2959d0a2bd83447f09ea7fee4 (diff) | |
| download | gitlab-ce-4b2cc8dc96b0f7f8c0a7edf345bc4c3d0b0932e6.tar.gz | |
Merge branch 'bugfix/add_hover_to_trash_icon' into 'master'
Add hover to trash icon in notes
## What does this MR do?
Adds hover to trash icon in notes (fixes a ~regression).
## Screenshots (if relevant)
### Before
### After
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [x] API support added
- Tests
- [x] Added for this feature/bug
- [x] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] 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 it does - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #23487
See merge request !7008
Diffstat (limited to 'CHANGELOG.md')
| -rw-r--r-- | CHANGELOG.md | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 518d0362d07..dc3dd569aea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ Please view this file on the master branch, on stable branches it's out of date. - Adds user project membership expired event to clarify why user was removed (Callum Dryden) - Trim leading and trailing whitespace on project_path (Linus Thiel) - Fix HipChat notifications rendering (airatshigapov, eisnerd) + - Add hover to trash icon in notes !7008 (blackst0ne) - Simpler arguments passed to named_route on toggle_award_url helper method - Fix: Backup restore doesn't clear cache |