diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-01 09:07:35 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-01 09:07:35 +0300 |
| commit | 0537e77587de43e2b3c5cbd8610641b3003a9840 (patch) | |
| tree | cc9275bdae7321d35be85208647c0bfd50abe7e6 /app/finders | |
| parent | 07be35d0583dcb6a7becd1401ebc8fb5b03c426b (diff) | |
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 | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/finders/ci/pipelines_for_merge_request_finder.rb b/app/finders/ci/pipelines_for_merge_request_finder.rb index 6c5038128f8..f769da03738 100644 --- a/app/finders/ci/pipelines_for_merge_request_finder.rb +++ b/app/finders/ci/pipelines_for_merge_request_finder.rb @@ -47,8 +47,7 @@ module Ci # rubocop: disable CodeReuse/ActiveRecord def pipelines_using_cte - sha_relation = merge_request.all_commits.select(:sha) - sha_relation = sha_relation.distinct if Feature.enabled?(:use_distinct_in_shas_cte, default_enabled: :yaml) + sha_relation = merge_request.all_commits.select(:sha).distinct cte = Gitlab::SQL::CTE.new(:shas, sha_relation) |