diff options
author | Phil Hughes <me@iamphill.com> | 2018-01-15 08:56:24 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2018-01-15 08:56:24 +0000 |
commit | 55e2bafc9ccbaa1be5d5e39a0fed3d4adda58223 (patch) | |
tree | 1ec39ab4ef4625e6f2c5ef249722fbad446273ce | |
parent | 5e3ef30259f9d257a084ed6b72ccbd713f0f8294 (diff) | |
parent | cb4cbcdca7d1437181a5e7ae980ca1cfc8aab831 (diff) | |
download | gitlab-ce-55e2bafc9ccbaa1be5d5e39a0fed3d4adda58223.tar.gz |
Merge branch 'dispatcher-project-mr' into 'master'
Refactor dispatcher project mr index path
Closes #41341
See merge request gitlab-org/gitlab-ce!16399
-rw-r--r-- | app/assets/javascripts/dispatcher.js | 5 | ||||
-rw-r--r-- | app/assets/javascripts/pages/projects/merge_requests/index/index.js | 16 |
2 files changed, 21 insertions, 0 deletions
diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js index 747c989c070..0aebab36ac5 100644 --- a/app/assets/javascripts/dispatcher.js +++ b/app/assets/javascripts/dispatcher.js @@ -121,6 +121,11 @@ import { fetchCommitMergeRequests } from './commit_merge_requests'; shortcut_handler = true; break; case 'projects:merge_requests:index': + import('./pages/projects/merge_requests/index') + .then(callDefault) + .catch(fail); + shortcut_handler = true; + break; case 'projects:issues:index': if (filteredSearchEnabled) { const filteredSearchManager = new gl.FilteredSearchManager(page === 'projects:issues:index' ? 'issues' : 'merge_requests'); diff --git a/app/assets/javascripts/pages/projects/merge_requests/index/index.js b/app/assets/javascripts/pages/projects/merge_requests/index/index.js new file mode 100644 index 00000000000..a52bea03aa2 --- /dev/null +++ b/app/assets/javascripts/pages/projects/merge_requests/index/index.js @@ -0,0 +1,16 @@ +import IssuableIndex from '~/issuable_index'; +import ShortcutsNavigation from '~/shortcuts_navigation'; +import UsersSelect from '~/users_select'; + +export default () => { + const filteredSearchEnabled = gl.FilteredSearchManager && document.querySelector('.filtered-search'); + + if (filteredSearchEnabled) { + const filteredSearchManager = new gl.FilteredSearchManager('merge_requests'); + filteredSearchManager.setup(); + } + + new IssuableIndex('merge_request_'); // eslint-disable-line no-new + new ShortcutsNavigation(); // eslint-disable-line no-new + new UsersSelect(); // eslint-disable-line no-new +}; |