Merge branch 'milestone-merged-mr-list' into 'master'

Milestone merged mr list Part of #1207

Merge branch 'milestone-merged-mr-list' into 'master'
Milestone merged mr list Part of #1207
Dmitriy Zaporozhets
2 parents 7e41eca3 ffd50e8c
Showing 2 changed files with 12 additions and 5 deletions Show diff stats
app/models/merge_request.rb
app/views/projects/milestones/show.html.haml
@@ -113,6 +113,7 @@ class MergeRequest &lt; 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
@@ -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
	@@ -113,6 +113,7 @@ class MergeRequest < ActiveRecord::Base		@@ -113,6 +113,7 @@ class MergeRequest < ActiveRecord::Base
113	# Closed scope for merge request should return	113	# Closed scope for merge request should return
114	# both merged and closed mr's	114	# both merged and closed mr's
115	scope :closed, -> { with_states(:closed, :merged) }	115	scope :closed, -> { with_states(:closed, :merged) }
		116	+ scope :declined, -> { with_states(:closed) }
116		117
117	def validate_branches	118	def validate_branches
118	if target_project == source_project && target_branch == source_branch	119	if target_project == source_project && target_branch == source_branch