diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2017-08-28 20:24:20 +0300 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2017-08-28 20:24:20 +0300 |
| commit | 1a09c20700a6ec227e5e4fcc6ec47252eb4f1f5e (patch) | |
| tree | c0a0d81f564136b74f052d1d7cc466085fdcc360 /app | |
| parent | df677647b80e558aec01ed2ed2130d9bd78930be (diff) | |
| parent | 5e0b1442f00817d9f940638e30c08c3f6add0a60 (diff) | |
Merge branch 'group-mr-search-bar' into 'master'
Add filtered search to group merge requests dashboard
Closes #36703
See merge request !13688
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/dispatcher.js | 4 | ||||
| -rw-r--r-- | app/views/groups/merge_requests.html.haml | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js index 2bba7f55de1..b71c449090e 100644 --- a/app/assets/javascripts/dispatcher.js +++ b/app/assets/javascripts/dispatcher.js @@ -184,13 +184,13 @@ import initChangesDropdown from './init_changes_dropdown'; break; case 'dashboard:issues': case 'dashboard:merge_requests': - case 'groups:merge_requests': new ProjectSelect(); initLegacyFilters(); break; case 'groups:issues': + case 'groups:merge_requests': if (filteredSearchEnabled) { - const filteredSearchManager = new gl.FilteredSearchManager('issues'); + const filteredSearchManager = new gl.FilteredSearchManager(page === 'groups:issues' ? 'issues' : 'merge_requests'); filteredSearchManager.setup(); } new ProjectSelect(); diff --git a/app/views/groups/merge_requests.html.haml b/app/views/groups/merge_requests.html.haml index 569eef46e6e..184df6f5406 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", type: :merge_requests @@ -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", type: :merge_requests - = render 'shared/issuable/filter', type: :merge_requests + = render 'shared/issuable/search_bar', type: :merge_requests .row-content-block.second-block Only merge requests from |