Commit d4e4ea78 authored by Stan Hu's avatar Stan Hu Committed by Thong Kuah

Fix broke CE tests due to merge train pipeline check

https://gitlab.com/gitlab-org/gitlab/-/merge_requests/52137 introduced a
`merge_train_pipeline?` check in the view, but this method was only
available in EE.

We now define a method in CE that is overriden in EE.
parent ee29b690
......@@ -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