Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'lib/gitlab/auth.rb')
-rw-r--r--lib/gitlab/auth.rb10
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/gitlab/auth.rb b/lib/gitlab/auth.rb
index 9ddfc995535..fc1f7a1583c 100644
--- a/lib/gitlab/auth.rb
+++ b/lib/gitlab/auth.rb
@@ -426,15 +426,21 @@ module Gitlab
end
def unavailable_scopes_for_resource(resource)
- unavailable_observability_scopes_for_resource(resource)
+ unavailable_observability_scopes_for_resource(resource) +
+ unavailable_ai_features_scopes_for_resource(resource)
end
def unavailable_observability_scopes_for_resource(resource)
- return [] if resource.is_a?(Group) && Gitlab::Observability.enabled?(resource)
+ return [] if (resource.is_a?(Project) || resource.is_a?(Group)) &&
+ Gitlab::Observability.should_enable_observability_auth_scopes?(resource)
OBSERVABILITY_SCOPES
end
+ def unavailable_ai_features_scopes_for_resource(_resource)
+ AI_FEATURES_SCOPES
+ end
+
def non_admin_available_scopes
API_SCOPES + REPOSITORY_SCOPES + registry_scopes + OBSERVABILITY_SCOPES + AI_FEATURES_SCOPES
end