Add filtered search to group merge requests dashboard
This commit is contained in:
parent
84336b848c
commit
05147e209e
|
@ -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();
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue