diff options
| author | Marin Jankovski <marin@gitlab.com> | 2014-06-30 12:41:27 +0200 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2014-06-30 12:41:27 +0200 |
| commit | d3796b84f8f3ab9da30447eb0bac2cf9aed32b31 (patch) | |
| tree | e97d44910f3071abc7b5c91b9e535ca8220b554d /app/views/groups/milestones | |
| parent | d145f09cd675fa46a6cc20fac8304f02d2d14656 (diff) | |
| download | gitlab-ce-d3796b84f8f3ab9da30447eb0bac2cf9aed32b31.tar.gz | |
Show all issues and merge requests that could be considered opened or closed, includes reopened and merged.
Diffstat (limited to 'app/views/groups/milestones')
| -rw-r--r-- | app/views/groups/milestones/_merge_requests.html.haml | 2 | ||||
| -rw-r--r-- | app/views/groups/milestones/show.html.haml | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/app/views/groups/milestones/_merge_requests.html.haml b/app/views/groups/milestones/_merge_requests.html.haml index ddf7f5ee559..50057e2c636 100644 --- a/app/views/groups/milestones/_merge_requests.html.haml +++ b/app/views/groups/milestones/_merge_requests.html.haml @@ -2,5 +2,5 @@ .panel-heading= title %ul{ class: "well-list merge_requests-sortable-list" } - if merge_requests - - merge_requests.sort_by(&:position).each do |merge_request| + - merge_requests.each do |merge_request| = render 'merge_request', merge_request: merge_request diff --git a/app/views/groups/milestones/show.html.haml b/app/views/groups/milestones/show.html.haml index 7e66318e968..1ed5907b718 100644 --- a/app/views/groups/milestones/show.html.haml +++ b/app/views/groups/milestones/show.html.haml @@ -54,16 +54,16 @@ .tab-pane.active#tab-issues .row .col-md-6 - = render 'issues', title: "Open", issues: @issues["opened"] + = render 'issues', title: "Open", issues: @group_milestone.opened_issues .col-md-6 - = render 'issues', title: "Closed", issues: @issues["closed"] + = render 'issues', title: "Closed", issues: @group_milestone.closed_issues .tab-pane#tab-merge-requests .row .col-md-6 - = render 'merge_requests', title: "Open", merge_requests: @merge_requests["opened"] + = render 'merge_requests', title: "Open", merge_requests: @group_milestone.opened_merge_requests .col-md-6 - = render 'merge_requests', title: "Closed", merge_requests: @merge_requests["closed"] + = render 'merge_requests', title: "Closed", merge_requests: @group_milestone.closed_merge_requests .tab-pane#tab-participants %ul.bordered-list |