diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-19 12:06:16 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-19 12:06:16 +0300 |
| commit | 34b3567c97ecc0f317adae04e10e4d7d8c8830db (patch) | |
| tree | 2612572041a8a6121ce9098cabf8724e67a96ea2 /app/services/auto_merge | |
| parent | 3209c1a49c14cab93eb347bfca59bace30879440 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/auto_merge')
| -rw-r--r-- | app/services/auto_merge/merge_when_pipeline_succeeds_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/auto_merge/merge_when_pipeline_succeeds_service.rb b/app/services/auto_merge/merge_when_pipeline_succeeds_service.rb index 6a33ec071db..7c0e9228b28 100644 --- a/app/services/auto_merge/merge_when_pipeline_succeeds_service.rb +++ b/app/services/auto_merge/merge_when_pipeline_succeeds_service.rb @@ -11,7 +11,7 @@ module AutoMerge end def process(merge_request) - return unless merge_request.actual_head_pipeline&.success? + return unless merge_request.actual_head_pipeline_success? return unless merge_request.mergeable? merge_request.merge_async(merge_request.merge_user_id, merge_request.merge_params) |