summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2018-11-26 11:49:52 +0000
committerFatih Acet <acetfatih@gmail.com>2018-11-26 11:49:52 +0000
commit4aa611053b1e1ff72a9c79e29824e7383539c47e (patch)
tree07f92cabf85cb70afc0df174523e990f29ec2173
parent35c1dfd13279f8da1aeba22c011f7b681ed11c6a (diff)
parent7c2723e39bf1495584d4aedc68cba6ed6378c3ce (diff)
downloadgitlab-ce-4aa611053b1e1ff72a9c79e29824e7383539c47e.tar.gz
Merge branch 'winh-issue-board-switcher-vue' into 'master'
Refactor issue boards switcher to single file Vue component (CE-port) See merge request gitlab-org/gitlab-ce!23274
-rw-r--r--app/views/shared/issuable/_search_bar.html.haml3
1 files changed, 1 insertions, 2 deletions
diff --git a/app/views/shared/issuable/_search_bar.html.haml b/app/views/shared/issuable/_search_bar.html.haml
index 824bbe3524b..6939aba6896 100644
--- a/app/views/shared/issuable/_search_bar.html.haml
+++ b/app/views/shared/issuable/_search_bar.html.haml
@@ -7,8 +7,7 @@
.issues-filters
.issues-details-filters.filtered-search-block{ class: block_css_class, "v-pre" => type == :boards_modal }
- if type == :boards
- #js-multiple-boards-switcher.inline.boards-switcher{ "v-cloak" => true }
- = render_if_exists "shared/boards/switcher", board: board
+ = render_if_exists "shared/boards/switcher", board: board
= form_tag page_filter_path, method: :get, class: 'filter-form js-filter-form' do
- if params[:search].present?
= hidden_field_tag :search, params[:search]