diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-05-25 18:00:27 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-05-25 18:01:14 +0300 |
| commit | ebe9c89082d1536d3f4c7e2071692277e7957d57 (patch) | |
| tree | ce5e2bdde2036f52db4aaf8f805e2a6587715fc8 /app/views/projects/milestones/show.html.haml | |
| parent | 84cb0dcbcd361730afcfbc72ea4aa7d9204f12d4 (diff) | |
Consistently refer to MRs as either Accepted or Rejected.
Diffstat (limited to 'app/views/projects/milestones/show.html.haml')
| -rw-r--r-- | app/views/projects/milestones/show.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/milestones/show.html.haml b/app/views/projects/milestones/show.html.haml index bba2b8764ac..0581c3a1b48 100644 --- a/app/views/projects/milestones/show.html.haml +++ b/app/views/projects/milestones/show.html.haml @@ -85,10 +85,10 @@ .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') + = render('merge_requests', title: 'Rejected (closed)', merge_requests: @merge_requests.rejected, id: 'closed') .col-md-3 .panel.panel-primary - .panel-heading Merged + .panel-heading Accepted %ul.well-list - @merge_requests.merged.each do |merge_request| = render 'merge_request', merge_request: merge_request |