diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-06-05 14:01:49 +0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-06-05 14:01:49 +0400 |
| commit | 336d50d008e8efcaef89ce5656620cbe068aa064 (patch) | |
| tree | ceed234eff808c65513eefcd525c59e5f16b81d1 /app/views/projects/milestones/show.html.haml | |
| parent | 868629dc40ca98ce3ad5740b27fe176c853ad72d (diff) | |
Merge request drag-n-drop on milestone page
Allows moving milestone between 3 columns: unassigned, assigned,
declined
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/views/projects/milestones/show.html.haml')
| -rw-r--r-- | app/views/projects/milestones/show.html.haml | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/app/views/projects/milestones/show.html.haml b/app/views/projects/milestones/show.html.haml index 67b45fc30ba..206bf474493 100644 --- a/app/views/projects/milestones/show.html.haml +++ b/app/views/projects/milestones/show.html.haml @@ -84,18 +84,12 @@ .tab-pane#tab-merge-requests .row - .col-md-6 - .panel.panel-default - .panel-heading Open - %ul.well-list - - @merge_requests.opened.each do |merge_request| - = render 'merge_request', merge_request: merge_request - .col-md-6 - .panel.panel-default - .panel-heading Closed - %ul.well-list - - @merge_requests.closed.each do |merge_request| - = render 'merge_request', merge_request: merge_request + .col-md-4 + = 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') .tab-pane#tab-participants %ul.bordered-list |