BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
55e2bafc
Commit
55e2bafc
authored
Jan 15, 2018
by
Phil Hughes
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dispatcher-project-mr' into 'master'
Refactor dispatcher project mr index path Closes #41341 See merge request gitlab-org/gitlab-ce!16399
parents
5e3ef302
cb4cbcdc
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
0 deletions
+21
-0
dispatcher.js
app/assets/javascripts/dispatcher.js
+5
-0
index.js
.../javascripts/pages/projects/merge_requests/index/index.js
+16
-0
No files found.
app/assets/javascripts/dispatcher.js
View file @
55e2bafc
...
@@ -121,6 +121,11 @@ import { fetchCommitMergeRequests } from './commit_merge_requests';
...
@@ -121,6 +121,11 @@ import { fetchCommitMergeRequests } from './commit_merge_requests';
shortcut_handler
=
true
;
shortcut_handler
=
true
;
break
;
break
;
case
'projects:merge_requests:index'
:
case
'projects:merge_requests:index'
:
import
(
'./pages/projects/merge_requests/index'
)
.
then
(
callDefault
)
.
catch
(
fail
);
shortcut_handler
=
true
;
break
;
case
'projects:issues:index'
:
case
'projects:issues:index'
:
if
(
filteredSearchEnabled
)
{
if
(
filteredSearchEnabled
)
{
const
filteredSearchManager
=
new
gl
.
FilteredSearchManager
(
page
===
'projects:issues:index'
?
'issues'
:
'merge_requests'
);
const
filteredSearchManager
=
new
gl
.
FilteredSearchManager
(
page
===
'projects:issues:index'
?
'issues'
:
'merge_requests'
);
...
...
app/assets/javascripts/pages/projects/merge_requests/index/index.js
0 → 100644
View file @
55e2bafc
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
};
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment