diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2017-11-07 22:12:19 +0900 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2017-11-07 22:12:19 +0900 |
| commit | d89c18901bde510da2668e676b3bf2f1e21deef2 (patch) | |
| tree | 57ddcc05bb1ca0d70bfb827d0e1ef4930c7ebf7b /app/policies | |
| parent | afef38533727cf32a7be324243a25b4db5eb5498 (diff) | |
| parent | 666ab4882f2c6d385c04afe269ddf5b11f795b19 (diff) | |
| download | gitlab-ce-d89c18901bde510da2668e676b3bf2f1e21deef2.tar.gz | |
Merge branch 'master' into fix/sm/31771-do-not-allow-jobs-to-be-erased-new
Diffstat (limited to 'app/policies')
| -rw-r--r-- | app/policies/clusters/cluster_policy.rb (renamed from app/policies/gcp/cluster_policy.rb) | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/policies/gcp/cluster_policy.rb b/app/policies/clusters/cluster_policy.rb index e77173ea6e1..1f7c13072b9 100644 --- a/app/policies/gcp/cluster_policy.rb +++ b/app/policies/clusters/cluster_policy.rb @@ -1,8 +1,8 @@ -module Gcp +module Clusters class ClusterPolicy < BasePolicy alias_method :cluster, :subject - delegate { @subject.project } + delegate { cluster.project } rule { can?(:master_access) }.policy do enable :update_cluster |