Commit 6ef7d089 authored by Thong Kuah's avatar Thong Kuah

Merge branch 'sh-fix-ce-merge-train-pipeline-failures' into 'master'

[RUN ALL RSPEC] Fix broke CE tests due to merge train pipeline check

See merge request gitlab-org/gitlab!52556
parents 226f3b2d d4e4ea78
......@@ -1214,6 +1214,11 @@ module Ci
end
# rubocop:enable Rails/FindEach
# EE-only
def merge_train_pipeline?
false
end
private
def add_message(severity, content)
......
......@@ -158,6 +158,7 @@ module EE
end
end
override :merge_train_pipeline?
def merge_train_pipeline?
merge_request_pipeline? && merge_train_ref?
end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment