Commit 70a6af9328b663c93a5802bf689362525ec4ae87
Exists in
spb-stable
and in
2 other branches
Merge branch 'milestone-merged-mr-list' into 'master'
Milestone merged mr list Part of #1207
Showing
2 changed files
with
12 additions
and
5 deletions
Show diff stats
app/models/merge_request.rb
| ... | ... | @@ -113,6 +113,7 @@ class MergeRequest < ActiveRecord::Base |
| 113 | 113 | # Closed scope for merge request should return |
| 114 | 114 | # both merged and closed mr's |
| 115 | 115 | scope :closed, -> { with_states(:closed, :merged) } |
| 116 | + scope :declined, -> { with_states(:closed) } | |
| 116 | 117 | |
| 117 | 118 | def validate_branches |
| 118 | 119 | if target_project == source_project && target_branch == source_branch | ... | ... |
app/views/projects/milestones/show.html.haml
| ... | ... | @@ -84,12 +84,18 @@ |
| 84 | 84 | |
| 85 | 85 | .tab-pane#tab-merge-requests |
| 86 | 86 | .row |
| 87 | - .col-md-4 | |
| 87 | + .col-md-3 | |
| 88 | 88 | = render('merge_requests', title: 'Work in progress (open and unassigned)', merge_requests: @merge_requests.opened.unassigned, id: 'unassigned') |
| 89 | - .col-md-4 | |
| 90 | - = render('merge_requests', title: 'Assigned (open and assigned)', merge_requests: @merge_requests.opened.assigned, id: 'ongoing') | |
| 91 | - .col-md-4 | |
| 92 | - = render('merge_requests', title: 'Declined (closed)', merge_requests: @merge_requests.closed, id: 'closed') | |
| 89 | + .col-md-3 | |
| 90 | + = render('merge_requests', title: 'Waiting for merge (open and assigned)', merge_requests: @merge_requests.opened.assigned, id: 'ongoing') | |
| 91 | + .col-md-3 | |
| 92 | + = render('merge_requests', title: 'Declined (closed)', merge_requests: @merge_requests.declined, id: 'closed') | |
| 93 | + .col-md-3 | |
| 94 | + .panel.panel-primary | |
| 95 | + .panel-heading Merged | |
| 96 | + %ul.well-list | |
| 97 | + - @merge_requests.merged.each do |merge_request| | |
| 98 | + = render 'merge_request', merge_request: merge_request | |
| 93 | 99 | |
| 94 | 100 | .tab-pane#tab-participants |
| 95 | 101 | %ul.bordered-list | ... | ... |