diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-20 09:40:42 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-20 09:40:42 +0000 |
commit | ee664acb356f8123f4f6b00b73c1e1cf0866c7fb (patch) | |
tree | f8479f94a28f66654c6a4f6fb99bad6b4e86a40e /app/views/shared/issuable/_sort_dropdown.html.haml | |
parent | 62f7d5c5b69180e82ae8196b7b429eeffc8e7b4f (diff) | |
download | gitlab-ce-ee664acb356f8123f4f6b00b73c1e1cf0866c7fb.tar.gz |
Add latest changes from gitlab-org/gitlab@15-5-stable-eev15.5.0-rc42
Diffstat (limited to 'app/views/shared/issuable/_sort_dropdown.html.haml')
-rw-r--r-- | app/views/shared/issuable/_sort_dropdown.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/shared/issuable/_sort_dropdown.html.haml b/app/views/shared/issuable/_sort_dropdown.html.haml index e36c4cd6be0..ccc1a9fda6e 100644 --- a/app/views/shared/issuable/_sort_dropdown.html.haml +++ b/app/views/shared/issuable/_sort_dropdown.html.haml @@ -1,5 +1,5 @@ - viewing_issues = controller.controller_name == 'issues' || controller.action_name == 'issues' -- viewing_merge_requests = controller.controller_name == 'merge_requests' +- viewing_merge_requests = controller.controller_name == 'merge_requests' || controller.action_name == 'merge_requests' - items = issuable_sort_options(viewing_issues, viewing_merge_requests) - selected = issuable_sort_option_overrides[@sort] || @sort |