diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-05-27 14:40:36 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-05-27 14:40:36 +0300 |
| commit | 9eec0d54362199b622fa14858c6f1ea600c295a0 (patch) | |
| tree | 8b03d6ae66ad4f3986bba0d6ea84aeb234f1de89 /app/views/projects/milestones/show.html.haml | |
| parent | 701c2e9a3b4b60642eba0ee00c3e11e1e43fb131 (diff) | |
| parent | 7df45882a93220c6250294fb653f5e64464ebb64 (diff) | |
Merge branch 'accepted-rejected-mrs' into 'master'
Add Accepted and Rejected tabs to MR lists.
Before, MRs were referred to as Merged or Closed, but the Merge button on the MR page read "Accept Merge Request", the activity feed even read "X accepted merge request Y", and the Closed tab on the MR index included both Merged _and_ Closed MRs. I've changed every occurrence to consistently refer to MRs as either Accepted or Rejected, which is less technical and more clearly two opposites.
Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2201.
See merge request !702
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 5845fd744f4..ee2139e75f6 100644 --- a/app/views/projects/milestones/show.html.haml +++ b/app/views/projects/milestones/show.html.haml @@ -86,10 +86,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 |