Add latest changes from gitlab-org/gitlab@14-8-stable-eev14.8.0-rc42

3 files changed, 83 insertions, 2 deletions

diff --git a/app/graphql/resolvers/ci/project_pipeline_counts_resolver.rb b/app/graphql/resolvers/ci/project_pipeline_counts_resolver.rb
new file mode 100644
index 00000000000..728bc9627c5
--- /dev/null
+++ b/app/graphql/resolvers/ci/project_pipeline_counts_resolver.rb
@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Resolvers
+  module Ci
+    class ProjectPipelineCountsResolver < BaseResolver
+      type Types::Ci::PipelineCountsType, null: true
+
+      argument :ref,
+              GraphQL::Types::String,
+              required: false,
+              description: "Filter pipelines by the ref they are run for."
+
+      argument :sha,
+              GraphQL::Types::String,
+              required: false,
+              description: "Filter pipelines by the SHA of the commit they are run for."
+
+      argument :source,
+              GraphQL::Types::String,
+              required: false,
+              description: "Filter pipelines by their source."
+
+      def resolve(**args)
+        ::Gitlab::PipelineScopeCounts.new(context[:current_user], object, args)
+      end
+    end
+  end
+end
diff --git a/app/graphql/resolvers/ci/runner_jobs_resolver.rb b/app/graphql/resolvers/ci/runner_jobs_resolver.rb
new file mode 100644
index 00000000000..2f6ca09d031
--- /dev/null
+++ b/app/graphql/resolvers/ci/runner_jobs_resolver.rb
@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module Resolvers
+  module Ci
+    class RunnerJobsResolver < BaseResolver
+      include Gitlab::Graphql::Authorize::AuthorizeResource
+      include LooksAhead
+
+      type ::Types::Ci::JobType.connection_type, null: true
+      authorize :read_builds
+      authorizes_object!
+
+      argument :statuses, [::Types::Ci::JobStatusEnum],
+               required: false,
+               description: 'Filter jobs by status.'
+
+      alias_method :runner, :object
+
+      def ready?(**args)
+        context[self.class] ||= { executions: 0 }
+        context[self.class][:executions] += 1
+
+        raise GraphQL::ExecutionError, "Jobs can be requested for only one runner at a time" if context[self.class][:executions] > 1
+
+        super
+      end
+
+      def resolve_with_lookahead(statuses: nil)
+        jobs = ::Ci::JobsFinder.new(current_user: current_user, runner: runner, params: { scope: statuses }).execute
+
+        apply_lookahead(jobs)
+      end
+
+      private
+
+      def preloads
+        {
+          previous_stage_jobs_and_needs: [:needs, :pipeline],
+          artifacts: [:job_artifacts],
+          pipeline: [:user]
+        }
+      end
+    end
+  end
+end
diff --git a/app/graphql/resolvers/ci/runners_resolver.rb b/app/graphql/resolvers/ci/runners_resolver.rb
index 9848b5a503f..e221dfea4d0 100644
--- a/app/graphql/resolvers/ci/runners_resolver.rb
+++ b/app/graphql/resolvers/ci/runners_resolver.rb
@@ -9,7 +9,12 @@ module Resolvers
 
       argument :active, ::GraphQL::Types::Boolean,
                required: false,
-               description: 'Filter runners by active (true) or paused (false) status.'
+               description: 'Filter runners by `active` (true) or `paused` (false) status.',
+               deprecated: { reason: :renamed, replacement: 'paused', milestone: '14.8' }
+
+      argument :paused, ::GraphQL::Types::Boolean,
+               required: false,
+               description: 'Filter runners by `paused` (true) or `active` (false) status.'
 
       argument :status, ::Types::Ci::RunnerStatusEnum,
                required: false,
@@ -41,8 +46,11 @@ module Resolvers
       protected
 
       def runners_finder_params(params)
+        # Give preference to paused argument over the deprecated 'active' argument
+        paused = params.fetch(:paused, params[:active] ? !params[:active] : nil)
+
         {
-          active: params[:active],
+          active: paused.nil? ? nil : !paused,
           status_status: params[:status]&.to_s,
           type_type: params[:type],
           tag_name: params[:tag_list],