diff options
| author | Thong Kuah <tkuah@gitlab.com> | 2019-06-28 00:29:19 +1200 |
|---|---|---|
| committer | Thong Kuah <tkuah@gitlab.com> | 2019-06-28 01:24:05 +1200 |
| commit | 8152efbe2fc486520ec5cd11d54a49fbf7e554bf (patch) | |
| tree | 224aa61a7751385b9963faaf773f3b9f3d9e6dcc /app/policies/clusters | |
| parent | 3f759e1674b19f9fc7690239c138fca8aeec6434 (diff) | |
| download | gitlab-ce-8152efbe2fc486520ec5cd11d54a49fbf7e554bf.tar.gz | |
Remove instance_clusters feature_flagremove_group_and_instance_clusters_feature_flag
Now we have terminals for instance and group clusters we can remove the
FF now. Deploying to instance clusters has been working without
complaints too.
Diffstat (limited to 'app/policies/clusters')
| -rw-r--r-- | app/policies/clusters/instance_policy.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/policies/clusters/instance_policy.rb b/app/policies/clusters/instance_policy.rb index e1045c85e6d..f72096e8fc6 100644 --- a/app/policies/clusters/instance_policy.rb +++ b/app/policies/clusters/instance_policy.rb @@ -6,9 +6,8 @@ module Clusters condition(:has_clusters, scope: :subject) { clusterable_has_clusters? } condition(:can_have_multiple_clusters) { multiple_clusters_available? } - condition(:instance_clusters_enabled) { Instance.enabled? } - rule { admin & instance_clusters_enabled }.policy do + rule { admin }.policy do enable :read_cluster enable :add_cluster enable :create_cluster |