Skip to content
代码片段 群组 项目
提交 6ef7d089 编辑于 作者: 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
No related branches found
No related tags found
无相关合并请求
...@@ -1214,6 +1214,11 @@ def reset_ancestor_bridges! ...@@ -1214,6 +1214,11 @@ def reset_ancestor_bridges!
end end
# rubocop:enable Rails/FindEach # rubocop:enable Rails/FindEach
# EE-only
def merge_train_pipeline?
false
end
private private
def add_message(severity, content) def add_message(severity, content)
......
...@@ -158,6 +158,7 @@ def merge_request_event_type ...@@ -158,6 +158,7 @@ def merge_request_event_type
end end
end end
override :merge_train_pipeline?
def merge_train_pipeline? def merge_train_pipeline?
merge_request_pipeline? && merge_train_ref? merge_request_pipeline? && merge_train_ref?
end end
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册