diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-10-06 21:34:03 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-10-06 21:34:03 +0000 |
| commit | a625757cb469612409d47326241818ddf4fca982 (patch) | |
| tree | a55a61bd79751823be6373f47a55459110ea1c06 /app/models/event.rb | |
| parent | 567bcf14cfc4e54e672516377c18fe65aa193556 (diff) | |
| parent | b4d614bdbcb50f506c56eaa180d7b3f3055884a8 (diff) | |
| download | gitlab-ce-a625757cb469612409d47326241818ddf4fca982.tar.gz | |
Merge branch 'fix-already-selected-activity-link' into 'master'
Fix inconsistent highlighting of already selected activity nav-links
## What does this MR do?
* Remove edge case where user could deselect an activity nav-link (which seems to be returning all the events)
* Explicitly add an `All` tab to return all the events
## Are there points in the code the reviewer needs to double check?
Shouldn't be
## Why was this MR needed?
Resolves existing UI inconsistency
## Screenshots (if relevant)
Before:
After:
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
- [x] All builds are passing
- [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 you do - 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 #21631
* Closes #21452
See merge request !6091
Diffstat (limited to 'app/models/event.rb')
0 files changed, 0 insertions, 0 deletions