summaryrefslogtreecommitdiff
path: root/app/policies
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2016-11-09 13:41:04 +0000
committerSean McGivern <sean@mcgivern.me.uk>2016-11-09 13:41:04 +0000
commita8fcaaf1bf27a2bcf20a0cde2546f0de7b73dced (patch)
tree5e006c7096862bfdf17085783e26d32559a05e59 /app/policies
parent940cb3db5b936aec90a08c94aa9952f9b52c1fd3 (diff)
parent3e75e453fb258b3e60f3e9606b5f589006a4654b (diff)
downloadgitlab-ce-a8fcaaf1bf27a2bcf20a0cde2546f0de7b73dced.tar.gz
Merge branch 'pipeline-notifications' into 'master'
Integrate CI emails into notification system Closes #21930 See merge request !6342
Diffstat (limited to 'app/policies')
-rw-r--r--app/policies/ci/build_policy.rb2
-rw-r--r--app/policies/ci/pipeline_policy.rb4
2 files changed, 5 insertions, 1 deletions
diff --git a/app/policies/ci/build_policy.rb b/app/policies/ci/build_policy.rb
index 2232e231cf8..8b25332b73c 100644
--- a/app/policies/ci/build_policy.rb
+++ b/app/policies/ci/build_policy.rb
@@ -5,7 +5,7 @@ module Ci
# If we can't read build we should also not have that
# ability when looking at this in context of commit_status
- %w(read create update admin).each do |rule|
+ %w[read create update admin].each do |rule|
cannot! :"#{rule}_commit_status" unless can? :"#{rule}_build"
end
end
diff --git a/app/policies/ci/pipeline_policy.rb b/app/policies/ci/pipeline_policy.rb
new file mode 100644
index 00000000000..3d2eef1c50c
--- /dev/null
+++ b/app/policies/ci/pipeline_policy.rb
@@ -0,0 +1,4 @@
+module Ci
+ class PipelinePolicy < BuildPolicy
+ end
+end