diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-26 09:08:36 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-26 09:08:36 +0000 |
| commit | 23d237110e6a646dec08e1f5b4696d2d9c51cfef (patch) | |
| tree | 3c568514c8e22203f50d38940cbb9865aad5bb02 /app/views/shared/issuable/_search_bar.html.haml | |
| parent | 274dff4f027da636f62361c811285cbb5d5a7c0c (diff) | |
| download | gitlab-ce-23d237110e6a646dec08e1f5b4696d2d9c51cfef.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/shared/issuable/_search_bar.html.haml')
| -rw-r--r-- | app/views/shared/issuable/_search_bar.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/shared/issuable/_search_bar.html.haml b/app/views/shared/issuable/_search_bar.html.haml index d341520e4a2..5da86195243 100644 --- a/app/views/shared/issuable/_search_bar.html.haml +++ b/app/views/shared/issuable/_search_bar.html.haml @@ -6,7 +6,7 @@ .issues-filters{ class: ("w-100" if type == :boards_modal) } .issues-details-filters.filtered-search-block.d-flex.flex-column.flex-lg-row{ class: block_css_class, "v-pre" => type == :boards_modal } - .d-flex.flex-column.flex-md-row.flex-grow-1.mb-lg-0.mb-md-2.mb-sm-0 + .d-flex.flex-column.flex-md-row.flex-grow-1.mb-lg-0.mb-md-2.mb-sm-0.w-100 - if type == :boards = render "shared/boards/switcher", board: board = form_tag page_filter_path, method: :get, class: 'filter-form js-filter-form w-100' do @@ -162,8 +162,8 @@ %button.clear-search.hidden{ type: 'button' } = icon('times') .filter-dropdown-container.d-flex.flex-column.flex-md-row - #js-board-labels-toggle - if type == :boards + #js-board-labels-toggle .js-board-config{ data: { can_admin_list: user_can_admin_list, has_scope: board.scoped? } } - if user_can_admin_list = render 'shared/issuable/board_create_list_dropdown', board: board |