summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2017-05-05 12:25:24 +0200
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2017-05-05 12:25:24 +0200
commit936367538043854c7b093b71ca315b8e469c55a4 (patch)
tree9cf4a769d9cffd234ad00cfadb940bcb14553c07 /app
parentb6facd8313f2996ffef9be8eb2c98d5146d7a137 (diff)
downloadgitlab-ce-936367538043854c7b093b71ca315b8e469c55a4.tar.gz
Use update build policy instead of new play policy
Diffstat (limited to 'app')
-rw-r--r--app/policies/ci/build_policy.rb12
-rw-r--r--app/policies/environment_policy.rb2
-rw-r--r--app/serializers/build_action_entity.rb2
-rw-r--r--app/serializers/build_entity.rb2
-rw-r--r--app/services/ci/play_build_service.rb2
-rw-r--r--app/views/projects/ci/builds/_build.html.haml2
6 files changed, 12 insertions, 10 deletions
diff --git a/app/policies/ci/build_policy.rb b/app/policies/ci/build_policy.rb
index 2c39d31488f..d4af4490608 100644
--- a/app/policies/ci/build_policy.rb
+++ b/app/policies/ci/build_policy.rb
@@ -1,5 +1,7 @@
module Ci
class BuildPolicy < CommitStatusPolicy
+ alias_method :build, :subject
+
def rules
super
@@ -9,17 +11,17 @@ module Ci
cannot! :"#{rule}_commit_status" unless can? :"#{rule}_build"
end
- can! :play_build if can_play_action?
+ if can?(:update_build) && protected_action?
+ cannot! :update_build
+ end
end
private
- alias_method :build, :subject
-
- def can_play_action?
+ def protected_action?
return false unless build.action?
- ::Gitlab::UserAccess
+ !::Gitlab::UserAccess
.new(user, project: build.project)
.can_push_to_branch?(build.ref)
end
diff --git a/app/policies/environment_policy.rb b/app/policies/environment_policy.rb
index cc94d4a7e05..2fa15e64562 100644
--- a/app/policies/environment_policy.rb
+++ b/app/policies/environment_policy.rb
@@ -12,6 +12,6 @@ class EnvironmentPolicy < BasePolicy
private
def can_play_stop_action?
- Ability.allowed?(user, :play_build, environment.stop_action)
+ Ability.allowed?(user, :update_build, environment.stop_action)
end
end
diff --git a/app/serializers/build_action_entity.rb b/app/serializers/build_action_entity.rb
index 3eff724ae91..75dda1af709 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? && can?(request.user, :play_build, build)
+ build.playable? && can?(request.user, :update_build, build)
end
end
diff --git a/app/serializers/build_entity.rb b/app/serializers/build_entity.rb
index 10ba7c90c10..1380b347d8e 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? && can?(request.user, :play_build, build)
+ build.playable? && can?(request.user, :update_build, build)
end
def detailed_status
diff --git a/app/services/ci/play_build_service.rb b/app/services/ci/play_build_service.rb
index 5b3ff1ced38..e24f48c2d16 100644
--- a/app/services/ci/play_build_service.rb
+++ b/app/services/ci/play_build_service.rb
@@ -1,7 +1,7 @@
module Ci
class PlayBuildService < ::BaseService
def execute(build)
- unless can?(current_user, :play_build, build)
+ unless can?(current_user, :update_build, build)
raise Gitlab::Access::AccessDeniedError
end
diff --git a/app/views/projects/ci/builds/_build.html.haml b/app/views/projects/ci/builds/_build.html.haml
index 2227d36eed2..c0019996176 100644
--- a/app/views/projects/ci/builds/_build.html.haml
+++ b/app/views/projects/ci/builds/_build.html.haml
@@ -102,7 +102,7 @@
= link_to cancel_namespace_project_build_path(job.project.namespace, job.project, job, return_to: request.original_url), method: :post, title: 'Cancel', class: 'btn btn-build' do
= icon('remove', class: 'cred')
- elsif allow_retry
- - if job.playable? && !admin && can?(current_user, :play_build, job)
+ - if job.playable? && !admin && can?(current_user, :update_build, job)
= link_to play_namespace_project_build_path(job.project.namespace, job.project, job, return_to: request.original_url), method: :post, title: 'Play', class: 'btn btn-build' do
= custom_icon('icon_play')
- elsif job.retryable?