Skip to content
Snippets Groups Projects

Fix bug in Merge When Checks Pass needing a pipeline

Merged Marc Shaw requested to merge fix_bug_in_merge_when_checks_pass into master
3 files
+ 25
52
Compare changes
  • Side-by-side
  • Inline
Files
3
@@ -4,6 +4,17 @@ module AutoMerge
class MergeWhenChecksPassService < AutoMerge::MergeWhenPipelineSucceedsService
extend Gitlab::Utils::Override
override :process
def process(merge_request)
logger.info("Processing Automerge")
return unless merge_request.mergeable?
logger.info("Merge request mergeable")
merge_request.merge_async(merge_request.merge_user_id, merge_request.merge_params)
end
override :overrideable_available_for_checks
def overrideable_available_for_checks(merge_request)
if Feature.enabled?(:additional_merge_when_checks_ready, merge_request.project)
Loading