diff options
| author | Oswaldo Ferreira <oswaldo@gitlab.com> | 2017-08-28 15:55:25 -0300 |
|---|---|---|
| committer | Oswaldo Ferreira <oswaldo@gitlab.com> | 2017-08-28 15:55:25 -0300 |
| commit | ffc576d7df8d9dd53806d48b1870d11785e8d2a7 (patch) | |
| tree | df148ec21967dc073426067e37285b19d6072d9f /app/controllers/projects/merge_requests_controller.rb | |
| parent | 9068083f869ff46c2bd3e206b762312150fe8c4e (diff) | |
| download | gitlab-ce-ffc576d7df8d9dd53806d48b1870d11785e8d2a7.tar.gz | |
Rename MergeRequest#async_merge to merge_async
Diffstat (limited to 'app/controllers/projects/merge_requests_controller.rb')
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 4 |
1 files changed, 2 insertions, 2 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 |