diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-27 00:13:04 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-27 00:13:04 +0000 |
| commit | 2385fdce54c41a08e6421af12a567c7f00a0efb0 (patch) | |
| tree | e00df2c29f935e5d0e252ca3a8071ba5d6dfa021 /app/finders | |
| parent | ef2f70470a506a56f7a87d0ea3039a7417be2ebf (diff) | |
| download | gitlab-ce-2385fdce54c41a08e6421af12a567c7f00a0efb0.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/finders')
| -rw-r--r-- | app/finders/ci/pipelines_for_merge_request_finder.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/finders/ci/pipelines_for_merge_request_finder.rb b/app/finders/ci/pipelines_for_merge_request_finder.rb index 9476c30f525..839ec417cd4 100644 --- a/app/finders/ci/pipelines_for_merge_request_finder.rb +++ b/app/finders/ci/pipelines_for_merge_request_finder.rb @@ -42,6 +42,8 @@ module Ci triggered_for_branch.for_sha(commit_shas) end + pipelines = pipelines.allow_cross_joins_across_databases(url: 'https://gitlab.com/gitlab-org/gitlab/-/issues/336891') + sort(pipelines) end end |