diff options
author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2017-04-12 12:19:39 +0200 |
---|---|---|
committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2017-04-12 12:57:13 +0200 |
commit | 7fc6b5b6ff23e2faba7f06a1362ada31f6f3436a (patch) | |
tree | 5d25037f5572c9771033b09a6b806ba2669adf02 /app/policies | |
parent | 6c6bc400d1d8a96f6e443788cd0b2c14addd88e3 (diff) | |
download | gitlab-ce-7fc6b5b6ff23e2faba7f06a1362ada31f6f3436a.tar.gz |
Do not inherit build policy in pipeline policy
Diffstat (limited to 'app/policies')
-rw-r--r-- | app/policies/base_policy.rb | 4 | ||||
-rw-r--r-- | app/policies/ci/pipeline_policy.rb | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/app/policies/base_policy.rb b/app/policies/base_policy.rb index 8890409d056..623424c63e0 100644 --- a/app/policies/base_policy.rb +++ b/app/policies/base_policy.rb @@ -97,6 +97,10 @@ class BasePolicy rules end + def rules + raise NotImplementedError + end + def delegate!(new_subject) @rule_set.merge(Ability.allowed(@user, new_subject)) end diff --git a/app/policies/ci/pipeline_policy.rb b/app/policies/ci/pipeline_policy.rb index 3d2eef1c50c..10aa2d3e72a 100644 --- a/app/policies/ci/pipeline_policy.rb +++ b/app/policies/ci/pipeline_policy.rb @@ -1,4 +1,7 @@ module Ci - class PipelinePolicy < BuildPolicy + class PipelinePolicy < BasePolicy + def rules + delegate! @subject.project + end end end |