Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42

2 files changed, 42 insertions, 14 deletions

diff --git a/app/finders/ci/commit_statuses_finder.rb b/app/finders/ci/commit_statuses_finder.rb
new file mode 100644
index 00000000000..3c465eb88f3
--- /dev/null
+++ b/app/finders/ci/commit_statuses_finder.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Ci
+  class CommitStatusesFinder
+    include ::Gitlab::Utils::StrongMemoize
+
+    def initialize(project, repository, current_user, refs)
+      @project = project
+      @repository = repository
+      @current_user = current_user
+      @refs = refs
+    end
+
+    def execute
+      return [] unless Ability.allowed?(@current_user, :read_pipeline, @project)
+
+      commit_statuses
+    end
+
+    private
+
+    def latest_commits
+      strong_memoize(:latest_commits) do
+        refs.map do |ref|
+          [ref.name, @repository.commit(ref.dereferenced_target).sha]
+        end.to_h
+      end
+    end
+
+    def commit_statuses
+      latest_pipelines = project.ci_pipelines.latest_pipeline_per_commit(latest_commits.values)
+
+      latest_commits.transform_values do |commit_sha|
+        latest_pipelines[commit_sha]&.detailed_status(current_user)
+      end.compact
+    end
+
+    attr_reader :project, :repository, :current_user, :refs
+  end
+end
diff --git a/app/finders/ci/jobs_finder.rb b/app/finders/ci/jobs_finder.rb
index 40c610f8209..78791d737da 100644
--- a/app/finders/ci/jobs_finder.rb
+++ b/app/finders/ci/jobs_finder.rb
@@ -25,11 +25,7 @@ module Ci
     attr_reader :current_user, :pipeline, :project, :params, :type
 
     def init_collection
-      if Feature.enabled?(:ci_jobs_finder_refactor, default_enabled: true)
-        pipeline_jobs || project_jobs || all_jobs
-      else
-        project ? project_builds : all_jobs
-      end
+      pipeline_jobs || project_jobs || all_jobs
     end
 
     def all_jobs
@@ -38,12 +34,6 @@ module Ci
       type.all
     end
 
-    def project_builds
-      raise Gitlab::Access::AccessDeniedError unless can?(current_user, :read_build, project)
-
-      project.builds.relevant
-    end
-
     def project_jobs
       return unless project
       raise Gitlab::Access::AccessDeniedError unless can?(current_user, :read_build, project)
@@ -59,9 +49,7 @@ module Ci
     end
 
     def filter_by_scope(builds)
-      if Feature.enabled?(:ci_jobs_finder_refactor, default_enabled: true)
-        return filter_by_statuses!(params[:scope], builds) if params[:scope].is_a?(Array)
-      end
+      return filter_by_statuses!(params[:scope], builds) if params[:scope].is_a?(Array)
 
       case params[:scope]
       when 'pending'