Add latest changes from gitlab-org/gitlab@15-10-stable-eev15.10.0-rc42

1 files changed, 6 insertions, 6 deletions

diff --git a/app/controllers/concerns/observability/content_security_policy.rb b/app/controllers/concerns/observability/content_security_policy.rb
index 3865e3b606d..1e25dc492a0 100644
--- a/app/controllers/concerns/observability/content_security_policy.rb
+++ b/app/controllers/concerns/observability/content_security_policy.rb
@@ -12,17 +12,17 @@ module Observability
                           defined?(project) ? project&.group : nil
                         end
 
-        next if p.directives.blank? || !Gitlab::Observability.observability_enabled?(current_user, current_group)
+        next if p.directives.blank? || !Feature.enabled?(:observability_group_tab, current_group)
 
         default_frame_src = p.directives['frame-src'] || p.directives['default-src']
 
         # When ObservabilityUI is not authenticated, it needs to be able
         # to redirect to the GL sign-in page, hence '/users/sign_in' and '/oauth/authorize'
-        frame_src_values = Array.wrap(default_frame_src) | [Gitlab::Observability.observability_url,
-                                                            Gitlab::Utils.append_path(Gitlab.config.gitlab.url,
-'/users/sign_in'),
-                                                            Gitlab::Utils.append_path(Gitlab.config.gitlab.url,
-'/oauth/authorize')]
+        frame_src_values = Array.wrap(default_frame_src) | [
+          Gitlab::Observability.observability_url,
+          Gitlab::Utils.append_path(Gitlab.config.gitlab.url, '/users/sign_in'),
+          Gitlab::Utils.append_path(Gitlab.config.gitlab.url, '/oauth/authorize')
+        ]
 
         p.frame_src(*frame_src_values)
       end