diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-14 12:08:19 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-14 12:08:19 +0300 |
| commit | 02ab65d49fc94be7c91e511899762236c122977d (patch) | |
| tree | 4d4bf4ec54a95a0d73e039fa1410ea841156ffb2 /app/views/shared | |
| parent | 4411353300cf8219d2b899785bc5103c549ba8cf (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/shared')
| -rw-r--r-- | app/views/shared/issuable/_search_bar.html.haml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/views/shared/issuable/_search_bar.html.haml b/app/views/shared/issuable/_search_bar.html.haml index 50530498f52..c3960ec5026 100644 --- a/app/views/shared/issuable/_search_bar.html.haml +++ b/app/views/shared/issuable/_search_bar.html.haml @@ -1,5 +1,6 @@ - type = local_assigns.fetch(:type) - board = local_assigns.fetch(:board, nil) +- show_sorting_dropdown = local_assigns.fetch(:show_sorting_dropdown, true) - is_not_boards_modal_or_productivity_analytics = type != :boards_modal && type != :productivity_analytics - block_css_class = is_not_boards_modal_or_productivity_analytics ? 'row-content-block second-block' : '' - user_can_admin_list = board && can?(current_user, :admin_list, board.resource_parent) @@ -169,5 +170,5 @@ - if @project #js-add-issues-btn.prepend-left-10{ data: { can_admin_list: can?(current_user, :admin_list, @project) } } #js-toggle-focus-btn - - elsif is_not_boards_modal_or_productivity_analytics + - elsif is_not_boards_modal_or_productivity_analytics && show_sorting_dropdown = render 'shared/issuable/sort_dropdown' |