Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42

4 files changed, 8 insertions, 10 deletions

diff --git a/app/finders/ci/daily_build_group_report_results_finder.rb b/app/finders/ci/daily_build_group_report_results_finder.rb
index 5ac1bbd0670..33aefe29392 100644
--- a/app/finders/ci/daily_build_group_report_results_finder.rb
+++ b/app/finders/ci/daily_build_group_report_results_finder.rb
@@ -94,4 +94,4 @@ module Ci
   end
 end
 
-Ci::DailyBuildGroupReportResultsFinder.prepend_if_ee('::EE::Ci::DailyBuildGroupReportResultsFinder')
+Ci::DailyBuildGroupReportResultsFinder.prepend_mod_with('Ci::DailyBuildGroupReportResultsFinder')
diff --git a/app/finders/ci/pipelines_finder.rb b/app/finders/ci/pipelines_finder.rb
index e509cf940b8..af7b23278a4 100644
--- a/app/finders/ci/pipelines_finder.rb
+++ b/app/finders/ci/pipelines_finder.rb
@@ -133,7 +133,7 @@ module Ci
       when true
         items.where.not(yaml_errors: nil)
       when false
-        items.where("yaml_errors IS NULL")
+        items.where(yaml_errors: nil)
       else
         items
       end
diff --git a/app/finders/ci/pipelines_for_merge_request_finder.rb b/app/finders/ci/pipelines_for_merge_request_finder.rb
index 1f6ee9d75ad..be65b1f6b3c 100644
--- a/app/finders/ci/pipelines_for_merge_request_finder.rb
+++ b/app/finders/ci/pipelines_for_merge_request_finder.rb
@@ -45,8 +45,12 @@ module Ci
 
     private
 
+    # rubocop: disable CodeReuse/ActiveRecord
     def pipelines_using_cte
-      cte = Gitlab::SQL::CTE.new(:shas, merge_request.all_commits.select(:sha))
+      sha_relation = merge_request.all_commits.select(:sha)
+      sha_relation = sha_relation.distinct if Feature.enabled?(:use_distinct_in_shas_cte)
+
+      cte = Gitlab::SQL::CTE.new(:shas, sha_relation)
 
       pipelines_for_merge_requests = triggered_by_merge_request
       pipelines_for_branch = filter_by_sha(triggered_for_branch, cte)
@@ -54,6 +58,7 @@ module Ci
       Ci::Pipeline.with(cte.to_arel) # rubocop: disable CodeReuse/ActiveRecord
         .from_union([pipelines_for_merge_requests, pipelines_for_branch])
     end
+    # rubocop: enable CodeReuse/ActiveRecord
 
     def filter_by_sha(pipelines, cte)
       hex = Arel::Nodes::SqlLiteral.new("'hex'")
diff --git a/app/finders/ci/runners_finder.rb b/app/finders/ci/runners_finder.rb
index 1b76211c524..60dd977ff94 100644
--- a/app/finders/ci/runners_finder.rb
+++ b/app/finders/ci/runners_finder.rb
@@ -4,8 +4,6 @@ module Ci
   class RunnersFinder < UnionFinder
     include Gitlab::Allowable
 
-    NUMBER_OF_RUNNERS_PER_PAGE = 30
-
     def initialize(current_user:, group: nil, params:)
       @params = params
       @group = group
@@ -18,7 +16,6 @@ module Ci
       filter_by_runner_type!
       filter_by_tag_list!
       sort!
-      paginate!
 
       @runners.with_tags
 
@@ -77,10 +74,6 @@ module Ci
       @runners = @runners.order_by(sort_key)
     end
 
-    def paginate!
-      @runners = @runners.page(@params[:page]).per(NUMBER_OF_RUNNERS_PER_PAGE)
-    end
-
     def filter_by!(scope_name, available_scopes)
       scope = @params[scope_name]