diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-20 21:38:24 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-20 21:38:24 +0300 |
commit | 983a0bba5d2a042c4a3bbb22432ec192c7501d82 (patch) | |
tree | b153cd387c14ba23bd5a07514c7c01fddf6a78a0 /app/services/auto_merge/merge_when_pipeline_succeeds_service.rb | |
parent | a2bddee2cdb38673df0e004d5b32d9f77797de64 (diff) |
Add latest changes from gitlab-org/gitlab@12-10-stable-ee
Diffstat (limited to 'app/services/auto_merge/merge_when_pipeline_succeeds_service.rb')
-rw-r--r-- | app/services/auto_merge/merge_when_pipeline_succeeds_service.rb | 4 |
1 files changed, 3 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 7c0e9228b28..9ae5bd1b5ec 100644 --- a/app/services/auto_merge/merge_when_pipeline_succeeds_service.rb +++ b/app/services/auto_merge/merge_when_pipeline_succeeds_service.rb @@ -30,7 +30,9 @@ module AutoMerge end def available_for?(merge_request) - merge_request.actual_head_pipeline&.active? + super do + merge_request.actual_head_pipeline&.active? + end end end end |