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
Léo-Paul Géneau
gitlab-ce
Commits
ffd50e8c
Commit
ffd50e8c
authored
10 years ago
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add merged mrs list to milestone page
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
7e41eca3
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
5 deletions
+12
-5
app/models/merge_request.rb
app/models/merge_request.rb
+1
-0
app/views/projects/milestones/show.html.haml
app/views/projects/milestones/show.html.haml
+11
-5
No files found.
app/models/merge_request.rb
View file @
ffd50e8c
...
...
@@ -113,6 +113,7 @@ class MergeRequest < ActiveRecord::Base
# Closed scope for merge request should return
# both merged and closed mr's
scope
:closed
,
->
{
with_states
(
:closed
,
:merged
)
}
scope
:declined
,
->
{
with_states
(
:closed
)
}
def
validate_branches
if
target_project
==
source_project
&&
target_branch
==
source_branch
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/milestones/show.html.haml
View file @
ffd50e8c
...
...
@@ -84,12 +84,18 @@
.tab-pane
#tab-merge-requests
.row
.col-md-
4
.col-md-
3
=
render
(
'merge_requests'
,
title:
'Work in progress (open and unassigned)'
,
merge_requests:
@merge_requests
.
opened
.
unassigned
,
id:
'unassigned'
)
.col-md-4
=
render
(
'merge_requests'
,
title:
'Assigned (open and assigned)'
,
merge_requests:
@merge_requests
.
opened
.
assigned
,
id:
'ongoing'
)
.col-md-4
=
render
(
'merge_requests'
,
title:
'Declined (closed)'
,
merge_requests:
@merge_requests
.
closed
,
id:
'closed'
)
.col-md-3
=
render
(
'merge_requests'
,
title:
'Waiting for merge (open and assigned)'
,
merge_requests:
@merge_requests
.
opened
.
assigned
,
id:
'ongoing'
)
.col-md-3
=
render
(
'merge_requests'
,
title:
'Declined (closed)'
,
merge_requests:
@merge_requests
.
declined
,
id:
'closed'
)
.col-md-3
.panel.panel-primary
.panel-heading
Merged
%ul
.well-list
-
@merge_requests
.
merged
.
each
do
|
merge_request
|
=
render
'merge_request'
,
merge_request:
merge_request
.tab-pane
#tab-participants
%ul
.bordered-list
...
...
This diff is collapsed.
Click to expand it.
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