diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-19 01:45:44 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-19 01:45:44 +0000 |
commit | 85dc423f7090da0a52c73eb66faf22ddb20efff9 (patch) | |
tree | 9160f299afd8c80c038f08e1545be119f5e3f1e1 /app/policies/project_policy.rb | |
parent | 15c2c8c66dbe422588e5411eee7e68f1fa440bb8 (diff) | |
download | gitlab-ce-85dc423f7090da0a52c73eb66faf22ddb20efff9.tar.gz |
Add latest changes from gitlab-org/gitlab@13-4-stable-ee
Diffstat (limited to 'app/policies/project_policy.rb')
-rw-r--r-- | app/policies/project_policy.rb | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/app/policies/project_policy.rb b/app/policies/project_policy.rb index b2432bfa608..87ee7d201e4 100644 --- a/app/policies/project_policy.rb +++ b/app/policies/project_policy.rb @@ -102,11 +102,6 @@ class ProjectPolicy < BasePolicy end with_scope :subject - condition(:moving_designs_disabled) do - !::Feature.enabled?(:reorder_designs, @subject, default_enabled: true) - end - - with_scope :subject condition(:service_desk_enabled) { @subject.service_desk_enabled? } # We aren't checking `:read_issue` or `:read_merge_request` in this case @@ -330,6 +325,12 @@ class ProjectPolicy < BasePolicy enable :destroy_design enable :read_terraform_state enable :read_pod_logs + enable :read_feature_flag + enable :create_feature_flag + enable :update_feature_flag + enable :destroy_feature_flag + enable :admin_feature_flag + enable :admin_feature_flags_user_lists end rule { can?(:developer_access) & user_confirmed? }.policy do @@ -376,6 +377,7 @@ class ProjectPolicy < BasePolicy enable :read_freeze_period enable :update_freeze_period enable :destroy_freeze_period + enable :admin_feature_flags_client end rule { public_project & metrics_dashboard_allowed }.policy do @@ -452,6 +454,8 @@ class ProjectPolicy < BasePolicy prevent :read_pipeline prevent :read_pipeline_schedule prevent(*create_read_update_admin_destroy(:release)) + prevent(*create_read_update_admin_destroy(:feature_flag)) + prevent(:admin_feature_flags_user_lists) end rule { container_registry_disabled }.policy do @@ -557,10 +561,6 @@ class ProjectPolicy < BasePolicy prevent :move_design end - rule { moving_designs_disabled }.policy do - prevent :move_design - end - rule { read_package_registry_deploy_token }.policy do enable :read_package enable :read_project |