From ebe9c89082d1536d3f4c7e2071692277e7957d57 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Mon, 25 May 2015 17:00:27 +0200
Subject: Consistently refer to MRs as either Accepted or Rejected.

---
 CHANGELOG                                                      | 1 +
 app/models/merge_request.rb                                    | 2 +-
 app/views/projects/merge_requests/_merge_request.html.haml     | 6 +++---
 app/views/projects/merge_requests/show/_mr_title.html.haml     | 4 ++--
 app/views/projects/merge_requests/show/_state_widget.html.haml | 4 ++--
 app/views/projects/milestones/show.html.haml                   | 4 ++--
 app/views/search/results/_merge_request.html.haml              | 4 ++--
 7 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 9e4033fcc3d..d2110c12567 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -7,6 +7,7 @@ v 7.12.0 (unreleased)
   - Update Asciidoctor gem to version 1.5.2. (Jakub Jirutka)
   - Fix resolving of relative links to repository files in AsciiDoc documents. (Jakub Jirutka)
   - Use the user list from the target project in a merge request (Stan Hu)
+  - Consistently refer to MRs as either Accepted or Rejected.
 
 v 7.11.2
   - no changes
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 64f3c39f131..d164076730b 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -133,7 +133,7 @@ class MergeRequest < 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) }
+  scope :rejected, -> { with_states(:closed) }
 
   def validate_branches
     if target_project == source_project && target_branch == source_branch
diff --git a/app/views/projects/merge_requests/_merge_request.html.haml b/app/views/projects/merge_requests/_merge_request.html.haml
index 5d5a23b5409..534f20ce54e 100644
--- a/app/views/projects/merge_requests/_merge_request.html.haml
+++ b/app/views/projects/merge_requests/_merge_request.html.haml
@@ -10,11 +10,11 @@
       - if merge_request.merged?
         %span
           %i.fa.fa-check
-          MERGED
+          ACCEPTED
       - elsif merge_request.closed?
         %span
-          %i.fa.fa-close
-          CLOSED
+          %i.fa.fa-ban
+          REJECTED
       - else
         %span.hidden-xs.hidden-sm
           %span.label-branch<
diff --git a/app/views/projects/merge_requests/show/_mr_title.html.haml b/app/views/projects/merge_requests/show/_mr_title.html.haml
index 46e92a9c558..0690fdb769f 100644
--- a/app/views/projects/merge_requests/show/_mr_title.html.haml
+++ b/app/views/projects/merge_requests/show/_mr_title.html.haml
@@ -1,9 +1,9 @@
 %h4.page-title
   .issue-box{ class: issue_box_class(@merge_request) }
     - if @merge_request.merged?
-      Merged
+      Accepted
     - elsif @merge_request.closed?
-      Closed
+      Rejected
     - else
       Open
   = "Merge Request ##{@merge_request.iid}"
diff --git a/app/views/projects/merge_requests/show/_state_widget.html.haml b/app/views/projects/merge_requests/show/_state_widget.html.haml
index 44bd9347f51..e4c71bfc1be 100644
--- a/app/views/projects/merge_requests/show/_state_widget.html.haml
+++ b/app/views/projects/merge_requests/show/_state_widget.html.haml
@@ -11,7 +11,7 @@
 
     - if @merge_request.closed?
       %h4
-        Closed
+        Rejected
         - if @merge_request.closed_event
           by #{link_to_member(@project, @merge_request.closed_event.author, avatar: false)}
           #{time_ago_with_tooltip(@merge_request.closed_event.created_at)}
@@ -19,7 +19,7 @@
 
     - if @merge_request.merged?
       %h4
-        Merged
+        Accepted
         - if @merge_request.merge_event
           by #{link_to_member(@project, @merge_request.merge_event.author, avatar: false)}
           #{time_ago_with_tooltip(@merge_request.merge_event.created_at)}
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
diff --git a/app/views/search/results/_merge_request.html.haml b/app/views/search/results/_merge_request.html.haml
index 2efa616d664..adfdd1c7506 100644
--- a/app/views/search/results/_merge_request.html.haml
+++ b/app/views/search/results/_merge_request.html.haml
@@ -11,6 +11,6 @@
     #{merge_request.project.name_with_namespace}
   .pull-right
     - if merge_request.merged?
-      %span.label.label-primary Merged
+      %span.label.label-primary Accepted
     - elsif merge_request.closed?
-      %span.label.label-danger Closed
+      %span.label.label-danger Rejected
-- 
cgit v1.2.1