summaryrefslogtreecommitdiff
path: root/app/views/groups
diff options
context:
space:
mode:
authorHiroyuki Sato <sathiroyuki@gmail.com>2017-08-19 23:12:05 +0900
committerHiroyuki Sato <sathiroyuki@gmail.com>2017-08-19 23:12:05 +0900
commit05147e209e8eef7aa817d992c87956220ae14943 (patch)
treeb044a878037c75b8764eb13f36697e748082104b /app/views/groups
parent84336b848caec71b9c2af2d826cf81e6a258f6e2 (diff)
downloadgitlab-ce-05147e209e8eef7aa817d992c87956220ae14943.tar.gz
Add filtered search to group merge requests dashboard
Diffstat (limited to 'app/views/groups')
-rw-r--r--app/views/groups/merge_requests.html.haml6
1 files changed, 5 insertions, 1 deletions
diff --git a/app/views/groups/merge_requests.html.haml b/app/views/groups/merge_requests.html.haml
index 997c82c77d9..ad5ab4b5d87 100644
--- a/app/views/groups/merge_requests.html.haml
+++ b/app/views/groups/merge_requests.html.haml
@@ -1,5 +1,9 @@
- page_title "Merge Requests"
+- content_for :page_specific_javascripts do
+ = webpack_bundle_tag 'common_vue'
+ = webpack_bundle_tag 'filtered_search'
+
- if show_new_nav? && current_user
- content_for :breadcrumbs_extra do
= render 'shared/new_project_item_select', path: 'merge_requests/new', label: "New merge request"
@@ -13,7 +17,7 @@
.nav-controls{ class: ("visible-xs" if show_new_nav?) }
= render 'shared/new_project_item_select', path: 'merge_requests/new', label: "New merge request"
- = render 'shared/issuable/filter', type: :merge_requests
+ = render 'shared/issuable/search_bar', type: :merge_requests
.row-content-block.second-block
Only merge requests from