summaryrefslogtreecommitdiff
path: root/lib/gitlab/ci/status/build/cancelable.rb
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-12-08 14:28:49 +0100
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-12-12 12:59:01 +0100
commit5059d0b834eeea22ada4b6ac98cfddc2123691e9 (patch)
tree921c5d1807941d93031ce986adbadbd2b461d5e5 /lib/gitlab/ci/status/build/cancelable.rb
parente0ce97fb7d7d995fa76df57bfaac6d3601800190 (diff)
downloadgitlab-ce-5059d0b834eeea22ada4b6ac98cfddc2123691e9.tar.gz
Incorporate permission checks into new CI statuses
[ci skip]
Diffstat (limited to 'lib/gitlab/ci/status/build/cancelable.rb')
-rw-r--r--lib/gitlab/ci/status/build/cancelable.rb12
1 files changed, 7 insertions, 5 deletions
diff --git a/lib/gitlab/ci/status/build/cancelable.rb b/lib/gitlab/ci/status/build/cancelable.rb
index bff0464ef0c..a8830b04715 100644
--- a/lib/gitlab/ci/status/build/cancelable.rb
+++ b/lib/gitlab/ci/status/build/cancelable.rb
@@ -3,10 +3,10 @@ module Gitlab
module Status
module Status
class Cancelable < SimpleDelegator
- extend Status::Extended
+ include Status::Extended
- def has_action?(current_user)
- can?(current_user, :update_build, subject)
+ def has_action?
+ can?(user, :update_build, subject)
end
def action_icon
@@ -14,14 +14,16 @@ module Gitlab
end
def action_path
- cancel_namespace_project_build_path(subject.project.namespace, subject.project, subject)
+ cancel_namespace_project_build_path(subject.project.namespace,
+ subject.project,
+ subject)
end
def action_method
:post
end
- def self.matches?(build)
+ def self.matches?(build, user)
build.cancelable?
end
end