From 32a9deb8061eae7fdb598a68d3a23b7d134aecd0 Mon Sep 17 00:00:00 2001
From: victorwu <victor@gitlab.com>
Date: Fri, 9 Dec 2016 01:39:20 -0600
Subject: [PATCH 1/2] Rename Accept Merge Request button to Merge button

---
 .../merge_requests/widget/open/_accept.html.haml   |  2 +-
 doc/user/permissions.md                            |  2 +-
 doc/workflow/forking_workflow.md                   |  2 +-
 features/project/merge_requests/accept.feature     |  6 +++---
 features/project/merge_requests/revert.feature     |  2 +-
 features/steps/project/merge_requests.rb           |  4 ++--
 .../steps/project/merge_requests/acceptance.rb     |  4 ++--
 features/steps/project/merge_requests/revert.rb    |  4 ++--
 ...f_mergeable_with_unresolved_discussions_spec.rb |  8 ++++----
 .../only_allow_merge_if_build_succeeds_spec.rb     | 14 +++++++-------
 10 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/app/views/projects/merge_requests/widget/open/_accept.html.haml b/app/views/projects/merge_requests/widget/open/_accept.html.haml
index 1f5b066ca7d9b5..231df74f7a5daa 100644
--- a/app/views/projects/merge_requests/widget/open/_accept.html.haml
+++ b/app/views/projects/merge_requests/widget/open/_accept.html.haml
@@ -26,7 +26,7 @@
                     Merge Immediately
         - else
           = f.button class: "btn btn-create btn-grouped js-merge-button accept_merge_request #{status_class}" do
-            Accept Merge Request
+            Merge
       - if @merge_request.force_remove_source_branch?
         .accept-control
           The source branch will be removed.
diff --git a/doc/user/permissions.md b/doc/user/permissions.md
index 7f606fa8cd065d..55fafab33d7b4f 100644
--- a/doc/user/permissions.md
+++ b/doc/user/permissions.md
@@ -35,7 +35,7 @@ The following table depicts the various user permission levels in a project.
 | Create new environments               |         |            | ✓           | ✓        | ✓      |
 | Stop environments                     |         |            | ✓           | ✓        | ✓      |
 | See a list of merge requests          |         | ✓          | ✓           | ✓        | ✓      |
-| Manage/Accept merge requests          |         |            | ✓           | ✓        | ✓      |
+| Manage/merge merge requests           |         |            | ✓           | ✓        | ✓      |
 | Create new merge request              |         |            | ✓           | ✓        | ✓      |
 | Create new branches                   |         |            | ✓           | ✓        | ✓      |
 | Push to non-protected branches        |         |            | ✓           | ✓        | ✓      |
diff --git a/doc/workflow/forking_workflow.md b/doc/workflow/forking_workflow.md
index 733d079bd4a015..776946445513b8 100644
--- a/doc/workflow/forking_workflow.md
+++ b/doc/workflow/forking_workflow.md
@@ -51,7 +51,7 @@ create the [merge request](merge_requests.md).
 ![Selecting branches](forking/branch_select.png)
 
 You can then assign the merge request to someone to have them review
-your changes. Upon pressing the 'Accept Merge Request' button, your
+your changes. Upon pressing the 'Merge' button, your
 changes will be added to the repository and branch you're merging into.
 
 ![New merge request](forking/merge_request.png)
diff --git a/features/project/merge_requests/accept.feature b/features/project/merge_requests/accept.feature
index 330ec8ae0fe552..7bdd5a20e7a61e 100644
--- a/features/project/merge_requests/accept.feature
+++ b/features/project/merge_requests/accept.feature
@@ -8,7 +8,7 @@ Feature: Project Merge Requests Acceptance
   Scenario: Accepting the Merge Request and removing the source branch
     Given I am on the Merge Request detail page
     When I click on "Remove source branch" option
-    And I click on Accept Merge Request
+    And I click on Merge
     Then I should see merge request merged
     And I should not see the Remove Source Branch button
 
@@ -16,13 +16,13 @@ Feature: Project Merge Requests Acceptance
   Scenario: Accepting the Merge Request when URL has an anchor
     Given I am on the Merge Request detail with note anchor page
     When I click on "Remove source branch" option
-    And I click on Accept Merge Request
+    And I click on Merge
     Then I should see merge request merged
     And I should not see the Remove Source Branch button
 
   @javascript
   Scenario: Accepting the Merge Request without removing the source branch
     Given I am on the Merge Request detail page
-    When I click on Accept Merge Request
+    When I click on Merge
     Then I should see merge request merged
     And I should see the Remove Source Branch button
diff --git a/features/project/merge_requests/revert.feature b/features/project/merge_requests/revert.feature
index d767b0888836ba..7c3edc0ffbc823 100644
--- a/features/project/merge_requests/revert.feature
+++ b/features/project/merge_requests/revert.feature
@@ -4,7 +4,7 @@ Feature: Revert Merge Requests
     Given There is an open Merge Request
       And I am signed in as a developer of the project
       And I am on the Merge Request detail page
-      And I click on Accept Merge Request
+      And I click on Merge
 
   @javascript
   Scenario: I revert a merge request
diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb
index 1058697f0411c8..193c16cf551185 100644
--- a/features/steps/project/merge_requests.rb
+++ b/features/steps/project/merge_requests.rb
@@ -378,7 +378,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
   end
 
   step 'merge request is mergeable' do
-    expect(page).to have_button 'Accept Merge Request'
+    expect(page).to have_button 'Merge'
   end
 
   step 'I modify merge commit message' do
@@ -392,7 +392,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
 
   step 'I accept this merge request' do
     page.within '.mr-state-widget' do
-      click_button "Accept Merge Request"
+      click_button "Merge"
     end
   end
 
diff --git a/features/steps/project/merge_requests/acceptance.rb b/features/steps/project/merge_requests/acceptance.rb
index 4fda0731e2f21d..bc47f7cda129d4 100644
--- a/features/steps/project/merge_requests/acceptance.rb
+++ b/features/steps/project/merge_requests/acceptance.rb
@@ -14,8 +14,8 @@ class Spinach::Features::ProjectMergeRequestsAcceptance < Spinach::FeatureSteps
     check('Remove source branch')
   end
 
-  step 'I click on Accept Merge Request' do
-    click_button('Accept Merge Request')
+  step 'I click on Merge' do
+    click_button('Merge')
   end
 
   step 'I should see the Remove Source Branch button' do
diff --git a/features/steps/project/merge_requests/revert.rb b/features/steps/project/merge_requests/revert.rb
index efbc4831ce1e59..65c7f7c7dbdd83 100644
--- a/features/steps/project/merge_requests/revert.rb
+++ b/features/steps/project/merge_requests/revert.rb
@@ -25,8 +25,8 @@ class Spinach::Features::RevertMergeRequests < Spinach::FeatureSteps
     visit merge_request_path(@merge_request)
   end
 
-  step 'I click on Accept Merge Request' do
-    click_button('Accept Merge Request')
+  step 'I click on Merge' do
+    click_button('Merge')
   end
 
   step 'I am signed in as a developer of the project' do
diff --git a/spec/features/merge_requests/check_if_mergeable_with_unresolved_discussions_spec.rb b/spec/features/merge_requests/check_if_mergeable_with_unresolved_discussions_spec.rb
index 7f11db3c4170d8..3a240c6f16641e 100644
--- a/spec/features/merge_requests/check_if_mergeable_with_unresolved_discussions_spec.rb
+++ b/spec/features/merge_requests/check_if_mergeable_with_unresolved_discussions_spec.rb
@@ -19,7 +19,7 @@
       it 'does not allow to merge' do
         visit_merge_request(merge_request)
 
-        expect(page).not_to have_button 'Accept Merge Request'
+        expect(page).not_to have_button 'Merge'
         expect(page).to have_content('This merge request has unresolved discussions')
       end
     end
@@ -32,7 +32,7 @@
       it 'allows MR to be merged' do
         visit_merge_request(merge_request)
 
-        expect(page).to have_button 'Accept Merge Request'
+        expect(page).to have_button 'Merge'
       end
     end
   end
@@ -46,7 +46,7 @@
       it 'does not allow to merge' do
         visit_merge_request(merge_request)
 
-        expect(page).to have_button 'Accept Merge Request'
+        expect(page).to have_button 'Merge'
       end
     end
 
@@ -58,7 +58,7 @@
       it 'allows MR to be merged' do
         visit_merge_request(merge_request)
 
-        expect(page).to have_button 'Accept Merge Request'
+        expect(page).to have_button 'Merge'
       end
     end
   end
diff --git a/spec/features/merge_requests/only_allow_merge_if_build_succeeds_spec.rb b/spec/features/merge_requests/only_allow_merge_if_build_succeeds_spec.rb
index 7e2907cd26fa1f..ae7ac5df92dd65 100644
--- a/spec/features/merge_requests/only_allow_merge_if_build_succeeds_spec.rb
+++ b/spec/features/merge_requests/only_allow_merge_if_build_succeeds_spec.rb
@@ -14,7 +14,7 @@
     it 'allows MR to be merged' do
       visit_merge_request(merge_request)
 
-      expect(page).to have_button 'Accept Merge Request'
+      expect(page).to have_button 'Merge'
     end
   end
 
@@ -49,7 +49,7 @@
         it 'does not allow MR to be merged' do
           visit_merge_request(merge_request)
 
-          expect(page).not_to have_button 'Accept Merge Request'
+          expect(page).not_to have_button 'Merge'
           expect(page).to have_content('Please retry the build or push a new commit to fix the failure.')
         end
       end
@@ -60,7 +60,7 @@
         it 'does not allow MR to be merged' do
           visit_merge_request(merge_request)
 
-          expect(page).not_to have_button 'Accept Merge Request'
+          expect(page).not_to have_button 'Merge'
           expect(page).to have_content('Please retry the build or push a new commit to fix the failure.')
         end
       end
@@ -71,7 +71,7 @@
         it 'allows MR to be merged' do
           visit_merge_request(merge_request)
 
-          expect(page).to have_button 'Accept Merge Request'
+          expect(page).to have_button 'Merge'
         end
       end
 
@@ -81,7 +81,7 @@
         it 'allows MR to be merged' do
           visit_merge_request(merge_request)
 
-          expect(page).to have_button 'Accept Merge Request'
+          expect(page).to have_button 'Merge'
         end
       end
     end
@@ -110,7 +110,7 @@
         it 'allows MR to be merged' do
           visit_merge_request(merge_request)
 
-          expect(page).to have_button 'Accept Merge Request'
+          expect(page).to have_button 'Merge'
         end
       end
 
@@ -120,7 +120,7 @@
         it 'allows MR to be merged' do
           visit_merge_request(merge_request)
 
-          expect(page).to have_button 'Accept Merge Request'
+          expect(page).to have_button 'Merge'
         end
       end
     end
-- 
GitLab


From d9ac3c5d6833c13af17abc56372b218c5dfa27fb Mon Sep 17 00:00:00 2001
From: victorwu <victor@gitlab.com>
Date: Thu, 15 Dec 2016 13:35:18 -0600
Subject: [PATCH 2/2] Update merge button text

---
 features/steps/project/ff_merge_requests.rb                | 6 +++---
 features/steps/project/merge_requests.rb                   | 4 ++--
 spec/features/merge_requests/merge_with_push_rules_spec.rb | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/features/steps/project/ff_merge_requests.rb b/features/steps/project/ff_merge_requests.rb
index 59af9fc3c4bf41..9f14ece99653b4 100644
--- a/features/steps/project/ff_merge_requests.rb
+++ b/features/steps/project/ff_merge_requests.rb
@@ -18,12 +18,12 @@ class Spinach::Features::ProjectFfMergeRequests < Spinach::FeatureSteps
   end
 
   step 'merge request is mergeable' do
-    expect(page).to have_button 'Accept Merge Request'
+    expect(page).to have_button 'Merge'
   end
 
   step 'I should see ff-only merge button' do
     expect(page).to have_content "Fast-forward merge without a merge commit"
-    expect(page).to have_button 'Accept Merge Request'
+    expect(page).to have_button 'Merge'
   end
 
   step 'merge request "Bug NS-05" is mergeable' do
@@ -32,7 +32,7 @@ class Spinach::Features::ProjectFfMergeRequests < Spinach::FeatureSteps
 
   step 'I accept this merge request' do
     page.within '.mr-state-widget' do
-      click_button "Accept Merge Request"
+      click_button "Merge"
     end
   end
 
diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb
index 193c16cf551185..e921657853aeed 100644
--- a/features/steps/project/merge_requests.rb
+++ b/features/steps/project/merge_requests.rb
@@ -610,7 +610,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
 
   step 'I should not see merge button' do
     page.within '.mr-state-widget' do
-      expect(page).not_to have_button("Accept Merge Request")
+      expect(page).not_to have_button("Merge")
     end
   end
 
@@ -622,7 +622,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
 
   step 'I should see approved merge request "Bug NS-04"' do
     page.within '.mr-state-widget' do
-      expect(page).to have_button("Accept Merge Request")
+      expect(page).to have_button("Merge")
     end
   end
 
diff --git a/spec/features/merge_requests/merge_with_push_rules_spec.rb b/spec/features/merge_requests/merge_with_push_rules_spec.rb
index 795878ba0ab25d..b9c4cbedcbc00e 100644
--- a/spec/features/merge_requests/merge_with_push_rules_spec.rb
+++ b/spec/features/merge_requests/merge_with_push_rules_spec.rb
@@ -18,7 +18,7 @@
     end
 
     it 'displays error message after merge request is clicked' do
-      click_button 'Accept Merge Request'
+      click_button 'Merge'
 
       expect(page).to have_content('Merge in progress')
       expect(page).to have_content('This merge request failed to be merged automatically')
@@ -35,7 +35,7 @@
     end
 
     it 'displays error message after merge request is clicked' do
-      click_button 'Accept Merge Request'
+      click_button 'Merge'
 
       expect(page).to have_content('Merge in progress')
       expect(page).to have_content('This merge request failed to be merged automatically')
-- 
GitLab