gitlab-org--gitlab-foss/app/controllers
Fatih Acet a625757cb4 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:
![4OzkoQVJYc](/uploads/fd2a7fdbde2159e875482ec7b828fe60/4OzkoQVJYc.gif)

After:
![E0lj8UhEUU](/uploads/7eb5155861eb79d72957de04c9f172c9/E0lj8UhEUU.gif)

## 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
2016-10-06 21:34:03 +00:00
..
admin
ci
concerns Merge branch 'restrict-failed-2fa-attempts' into 'master' 2016-10-04 15:04:57 +00:00
dashboard
explore Refactor TrendingProjectsFinder to support caching 2016-10-05 16:39:03 +02:00
groups Fix a few things after the initial improvment to Members::DestroyService 2016-10-03 16:57:48 +02:00
import Enable import/export back for non-admins 2016-10-03 10:53:18 +02:00
oauth
profiles
projects Improve issue load time performance by avoiding ORDER BY in find_by call 2016-10-06 12:13:03 -07:00
sherlock
abuse_reports_controller.rb
application_controller.rb Fix inconsistent highlighting of already selected activity nav-links 2016-10-05 15:38:18 -05:00
autocomplete_controller.rb
confirmations_controller.rb
dashboard_controller.rb
emojis_controller.rb
groups_controller.rb
health_check_controller.rb
help_controller.rb
invites_controller.rb
jwt_controller.rb
koding_controller.rb
namespaces_controller.rb
notification_settings_controller.rb
omniauth_callbacks_controller.rb
passwords_controller.rb
profiles_controller.rb
projects_controller.rb
registrations_controller.rb
root_controller.rb
search_controller.rb
sent_notifications_controller.rb
sessions_controller.rb
snippets_controller.rb
uploads_controller.rb
users_controller.rb