Add latest changes from gitlab-org/gitlab@master

1 files changed, 15 insertions, 1 deletions

diff --git a/app/serializers/runner_entity.rb b/app/serializers/runner_entity.rb
index 6d6ba920a3b..cf0b2e2c3f6 100644
--- a/app/serializers/runner_entity.rb
+++ b/app/serializers/runner_entity.rb
@@ -9,6 +9,10 @@ class RunnerEntity < Grape::Entity
     edit_project_runner_path(project, runner)
   end
 
+  expose :admin_path, if: -> (*) { can_admin_runner? } do |runner|
+    Gitlab::Routing.url_helpers.admin_runner_url(runner)
+  end
+
   private
 
   alias_method :runner, :object
@@ -17,7 +21,17 @@ class RunnerEntity < Grape::Entity
     request.project
   end
 
+  def current_user
+    request.current_user
+  end
+
   def can_edit_runner?
-    can?(request.current_user, :update_runner, runner) && runner.project_type?
+    can?(current_user, :update_runner, runner) && runner.project_type?
+  end
+
+  # can_admin_all_resources? is used here because the
+  # path exposed is only available to admins
+  def can_admin_runner?
+    current_user&.can_admin_all_resources?
   end
 end