diff options
Diffstat (limited to 'app/policies/group_policy.rb')
| -rw-r--r-- | app/policies/group_policy.rb | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/app/policies/group_policy.rb b/app/policies/group_policy.rb index faa83019bda..2ab59f5a34d 100644 --- a/app/policies/group_policy.rb +++ b/app/policies/group_policy.rb @@ -72,10 +72,6 @@ class GroupPolicy < Namespaces::GroupProjectNamespaceSharedPolicy access_level(for_any_session: true) >= GroupMember::GUEST || valid_dependency_proxy_deploy_token end - condition(:observability_enabled, scope: :subject) do - Feature.enabled?(:observability_group_tab, @subject) - end - desc "Deploy token with read_package_registry scope" condition(:read_package_registry_deploy_token) do @user.is_a?(DeployToken) && @user.groups.include?(@subject) && @user.read_package_registry @@ -174,7 +170,9 @@ class GroupPolicy < Namespaces::GroupProjectNamespaceSharedPolicy prevent :read_design_activity end - rule { has_access }.enable :read_namespace + rule { has_access }.enable :read_namespace_via_membership + + rule { can?(:read_namespace_via_membership) }.enable :read_namespace rule { developer }.policy do enable :admin_metrics_dashboard_annotation @@ -364,14 +362,6 @@ class GroupPolicy < Namespaces::GroupProjectNamespaceSharedPolicy enable :destroy_resource_access_tokens end - rule { can?(:developer_access) & observability_enabled }.policy do - enable :read_observability - end - - rule { can?(:maintainer_access) & observability_enabled }.policy do - enable :admin_observability - end - # Should be matched with ProjectPolicy#read_internal_note rule { admin | reporter }.enable :read_internal_note |