Use build policy to determine if user can play build

6 files changed, 5 insertions, 16 deletions

diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index 9edc4cd96b9..b3acb25b9ce 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -115,12 +115,6 @@ module Ci
       commands.present?
     end
 
-    def can_play?(current_user)
-      ::Gitlab::UserAccess
-        .new(current_user, project: project)
-        .can_push_to_branch?(ref)
-    end
-
     def play(current_user)
       Ci::PlayBuildService
         .new(project, current_user)
diff --git a/app/models/environment.rb b/app/models/environment.rb
index f8b9a21c08e..bf33010fd21 100644
--- a/app/models/environment.rb
+++ b/app/models/environment.rb
@@ -122,12 +122,6 @@ class Environment < ActiveRecord::Base
     available? && stop_action.present?
   end
 
-  def can_trigger_stop_action?(current_user)
-    return false unless stop_action?
-
-    stop_action.can_play?(current_user)
-  end
-
   def stop_with_action!(current_user)
     return unless available?
 
diff --git a/app/serializers/build_action_entity.rb b/app/serializers/build_action_entity.rb
index 3d12c64b88a..0bb7e561073 100644
--- a/app/serializers/build_action_entity.rb
+++ b/app/serializers/build_action_entity.rb
@@ -19,6 +19,6 @@ class BuildActionEntity < Grape::Entity
   alias_method :build, :object
 
   def playable?
-    build.playable? && build.can_play?(request.user)
+    can?(request.user, :play_build, build) && build.playable?
   end
 end
diff --git a/app/serializers/build_entity.rb b/app/serializers/build_entity.rb
index 401a277dadc..f301900c43c 100644
--- a/app/serializers/build_entity.rb
+++ b/app/serializers/build_entity.rb
@@ -26,7 +26,7 @@ class BuildEntity < Grape::Entity
   alias_method :build, :object
 
   def playable?
-    build.playable? && build.can_play?(request.user)
+    can?(request.user, :play_build, build) && build.playable?
   end
 
   def detailed_status
diff --git a/app/services/ci/stop_environments_service.rb b/app/services/ci/stop_environments_service.rb
index d1e341bc9b5..bd9735fc0ac 100644
--- a/app/services/ci/stop_environments_service.rb
+++ b/app/services/ci/stop_environments_service.rb
@@ -9,7 +9,8 @@ module Ci
       return unless can?(current_user, :create_deployment, project)
 
       environments.each do |environment|
-        next unless environment.can_trigger_stop_action?(current_user)
+        next unless environment.stop_action?
+        next unless can?(current_user, :play_build, environment.stop_action)
 
         environment.stop_with_action!(current_user)
       end
diff --git a/app/views/projects/ci/builds/_build.html.haml b/app/views/projects/ci/builds/_build.html.haml
index ceec36e2440..769640c4842 100644
--- a/app/views/projects/ci/builds/_build.html.haml
+++ b/app/views/projects/ci/builds/_build.html.haml
@@ -101,7 +101,7 @@
           = link_to cancel_namespace_project_build_path(build.project.namespace, build.project, build, return_to: request.original_url), method: :post, title: 'Cancel', class: 'btn btn-build' do
             = icon('remove', class: 'cred')
         - elsif allow_retry
-          - if build.playable? && !admin && build.can_play?(current_user)
+          - if build.playable? && !admin && can?(current_user, :play_build, build)
             = link_to play_namespace_project_build_path(build.project.namespace, build.project, build, return_to: request.original_url), method: :post, title: 'Play', class: 'btn btn-build' do
               = custom_icon('icon_play')
           - elsif build.retryable?