Add latest changes from gitlab-org/gitlab@master

1 files changed, 6 insertions, 0 deletions

diff --git a/app/graphql/types/ci/job_type.rb b/app/graphql/types/ci/job_type.rb
index 253fee19f2e..e77c2a38608 100644
--- a/app/graphql/types/ci/job_type.rb
+++ b/app/graphql/types/ci/job_type.rb
@@ -27,6 +27,8 @@ module Types
                                                    description: 'References to builds that must complete before the jobs run.'
       field :pipeline, Types::Ci::PipelineType, null: true,
                                                 description: 'Pipeline the job belongs to.'
+
+      field :runner, Types::Ci::RunnerType, null: true, description: 'Runner assigned to execute the job.'
       field :runner_manager, ::Types::Ci::RunnerManagerType, null: true,
             description: 'Runner manager assigned to the job.',
             alpha: { milestone: '15.11' }
@@ -187,6 +189,10 @@ module Types
         ::Gitlab::Graphql::Loaders::BatchModelLoader.new(::Ci::Stage, object.stage_id).find
       end
 
+      def runner
+        Gitlab::Graphql::Loaders::BatchModelLoader.new(::Ci::Runner, object.runner_id).find
+      end
+
       def runner_manager
         BatchLoader::GraphQL.for(object.id).batch(key: :runner_managers) do |build_ids, loader|
           plucked_build_to_runner_manager_ids =