home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-12 06:06:05 +10:00
Code Issues Packages Projects Releases Wiki Activity

Add merged mrs list to milestone page

Browse Source 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
This commit is contained in:
Dmitriy Zaporozhets
2014-06-05 16:28:13 +03:00
parent 7e41eca38a
commit ffd50e8cf5
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/models/merge_request.rb
+1
View File
@@ -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
app/views/projects/milestones/show.html.haml
+11 -5
View File
@@ -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