Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
05147e20
Commit
05147e20
authored
Aug 19, 2017
by
Hiroyuki Sato
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add filtered search to group merge requests dashboard
parent
84336b84
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
3 deletions
+7
-3
app/assets/javascripts/dispatcher.js
app/assets/javascripts/dispatcher.js
+2
-2
app/views/groups/merge_requests.html.haml
app/views/groups/merge_requests.html.haml
+5
-1
No files found.
app/assets/javascripts/dispatcher.js
View file @
05147e20
...
@@ -184,13 +184,13 @@ import initChangesDropdown from './init_changes_dropdown';
...
@@ -184,13 +184,13 @@ import initChangesDropdown from './init_changes_dropdown';
break
;
break
;
case
'
dashboard:issues
'
:
case
'
dashboard:issues
'
:
case
'
dashboard:merge_requests
'
:
case
'
dashboard:merge_requests
'
:
case
'
groups:merge_requests
'
:
new
ProjectSelect
();
new
ProjectSelect
();
initLegacyFilters
();
initLegacyFilters
();
break
;
break
;
case
'
groups:issues
'
:
case
'
groups:issues
'
:
case
'
groups:merge_requests
'
:
if
(
filteredSearchEnabled
)
{
if
(
filteredSearchEnabled
)
{
const
filteredSearchManager
=
new
gl
.
FilteredSearchManager
(
'
issue
s
'
);
const
filteredSearchManager
=
new
gl
.
FilteredSearchManager
(
page
===
'
groups:issues
'
?
'
issues
'
:
'
merge_request
s
'
);
filteredSearchManager
.
setup
();
filteredSearchManager
.
setup
();
}
}
new
ProjectSelect
();
new
ProjectSelect
();
...
...
app/views/groups/merge_requests.html.haml
View file @
05147e20
-
page_title
"Merge Requests"
-
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
-
if
show_new_nav?
&&
current_user
-
content_for
:breadcrumbs_extra
do
-
content_for
:breadcrumbs_extra
do
=
render
'shared/new_project_item_select'
,
path:
'merge_requests/new'
,
label:
"New merge request"
=
render
'shared/new_project_item_select'
,
path:
'merge_requests/new'
,
label:
"New merge request"
...
@@ -13,7 +17,7 @@
...
@@ -13,7 +17,7 @@
.nav-controls
{
class:
(
"visible-xs"
if
show_new_nav?
)
}
.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/new_project_item_select'
,
path:
'merge_requests/new'
,
label:
"New merge request"
=
render
'shared/issuable/
filte
r'
,
type: :merge_requests
=
render
'shared/issuable/
search_ba
r'
,
type: :merge_requests
.row-content-block.second-block
.row-content-block.second-block
Only merge requests from
Only merge requests from
...
...
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