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/services | |
| parent | 9068083f869ff46c2bd3e206b762312150fe8c4e (diff) | |
| download | gitlab-ce-ffc576d7df8d9dd53806d48b1870d11785e8d2a7.tar.gz | |
Rename MergeRequest#async_merge to merge_async
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/merge_requests/merge_when_pipeline_succeeds_service.rb | 2 | ||||
| -rw-r--r-- | app/services/merge_requests/update_service.rb | 2 |
2 files changed, 2 insertions, 2 deletions
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 |