From ffc576d7df8d9dd53806d48b1870d11785e8d2a7 Mon Sep 17 00:00:00 2001
From: Oswaldo Ferreira <oswaldo@gitlab.com>
Date: Mon, 28 Aug 2017 15:55:25 -0300
Subject: [PATCH] Rename MergeRequest#async_merge to merge_async

---
 app/controllers/projects/merge_requests_controller.rb         | 4 ++--
 app/models/merge_request.rb                                   | 2 +-
 .../merge_requests/merge_when_pipeline_succeeds_service.rb    | 2 +-
 app/services/merge_requests/update_service.rb                 | 2 +-
 spec/models/merge_request_spec.rb                             | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index 6f3dcc1d6fa..e3fa3736808 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -318,14 +318,14 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo
       elsif @merge_request.head_pipeline.success?
         # This can be triggered when a user clicks the auto merge button while
         # the tests finish at about the same time
-        @merge_request.async_merge(current_user.id, params)
+        @merge_request.merge_async(current_user.id, params)
 
         :success
       else
         :failed
       end
     else
-      @merge_request.async_merge(current_user.id, params)
+      @merge_request.merge_async(current_user.id, params)
 
       :success
     end
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 8c1ea5625db..7f73de67625 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -244,7 +244,7 @@ class MergeRequest < ActiveRecord::Base
   # Calls `MergeWorker` to proceed with the merge process and
   # updates `merge_jid` with the MergeWorker#jid.
   # This helps tracking enqueued and ongoing merge jobs.
-  def async_merge(user_id, params)
+  def merge_async(user_id, params)
     jid = MergeWorker.perform_async(id, user_id, params)
     update_column(:merge_jid, jid)
   end
diff --git a/app/services/merge_requests/merge_when_pipeline_succeeds_service.rb b/app/services/merge_requests/merge_when_pipeline_succeeds_service.rb
index 57c82e39410..850deb0ac7a 100644
--- a/app/services/merge_requests/merge_when_pipeline_succeeds_service.rb
+++ b/app/services/merge_requests/merge_when_pipeline_succeeds_service.rb
@@ -30,7 +30,7 @@ module MergeRequests
           next
         end
 
-        merge_request.async_merge(merge_request.merge_user_id, merge_request.merge_params)
+        merge_request.merge_async(merge_request.merge_user_id, merge_request.merge_params)
       end
     end
 
diff --git a/app/services/merge_requests/update_service.rb b/app/services/merge_requests/update_service.rb
index 6563a4101a3..2832d893e95 100644
--- a/app/services/merge_requests/update_service.rb
+++ b/app/services/merge_requests/update_service.rb
@@ -83,7 +83,7 @@ module MergeRequests
       if merge_request.head_pipeline && merge_request.head_pipeline.active?
         MergeRequests::MergeWhenPipelineSucceedsService.new(project, current_user).execute(merge_request)
       else
-        merge_request.async_merge(current_user.id, {})
+        merge_request.merge_async(current_user.id, {})
       end
     end
 
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb
index de2f6c2139d..92cf15a5a51 100644
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
@@ -931,7 +931,7 @@ describe MergeRequest do
     end
   end
 
-  describe '#async_merge' do
+  describe '#merge_async' do
     it 'enqueues MergeWorker job and updates merge_jid' do
       merge_request = create(:merge_request)
       user_id = double(:user_id)
@@ -942,7 +942,7 @@ describe MergeRequest do
         merge_jid
       end
 
-      merge_request.async_merge(user_id, params)
+      merge_request.merge_async(user_id, params)
 
       expect(merge_request.reload.merge_jid).to eq(merge_jid)
     end