Rename Accept Merge Request button to Merge button24559-accepting-a-merge-request-isn-t-obvious

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 435fe835fae..271ed9a41ef 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 39fe2409a29..0fd126f9e25 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 733d079bd4a..77694644551 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 330ec8ae0fe..7bdd5a20e7a 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 d767b088883..7c3edc0ffbc 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 d2fa8cd39af..4d330c79b04 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 4fda0731e2f..bc47f7cda12 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 efbc4831ce1..65c7f7c7dbd 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 7f11db3c417..3a240c6f166 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 @@ feature 'Check if mergeable with unresolved discussions', js: true, feature: tru
       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 @@ feature 'Check if mergeable with unresolved discussions', js: true, feature: tru
       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 @@ feature 'Check if mergeable with unresolved discussions', js: true, feature: tru
       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 @@ feature 'Check if mergeable with unresolved discussions', js: true, feature: tru
       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 7e2907cd26f..ae7ac5df92d 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 @@ feature 'Only allow merge requests to be merged if the build succeeds', feature:
     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 @@ feature 'Only allow merge requests to be merged if the build succeeds', feature:
         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 @@ feature 'Only allow merge requests to be merged if the build succeeds', feature:
         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 @@ feature 'Only allow merge requests to be merged if the build succeeds', feature:
         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 @@ feature 'Only allow merge requests to be merged if the build succeeds', feature:
         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 @@ feature 'Only allow merge requests to be merged if the build succeeds', feature:
         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 @@ feature 'Only allow merge requests to be merged if the build succeeds', feature:
         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