Add latest changes from gitlab-org/gitlab@master

1 files changed, 6 insertions, 7 deletions

diff --git a/lib/gitlab/observability.rb b/lib/gitlab/observability.rb
index 853eecc946f..47220e33189 100644
--- a/lib/gitlab/observability.rb
+++ b/lib/gitlab/observability.rb
@@ -19,6 +19,12 @@ module Gitlab
       'https://observe.gitlab.com'
     end
 
+    def enabled?(group = nil)
+      return Feature.enabled?(:observability_group_tab, group) if group
+
+      Feature.enabled?(:observability_group_tab)
+    end
+
     def valid_observability_url?(url)
       uri = URI.parse(url)
       observability_uri = URI.parse(Gitlab::Observability.observability_url)
@@ -31,13 +37,6 @@ module Gitlab
       false
     end
 
-    def group_id_from_url(url)
-      return unless valid_observability_url?(url)
-
-      group_id = URI.parse(url).path.split('/')[1]
-      group_id.to_i unless group_id.to_i <= 0
-    end
-
     def allowed_for_action?(user, group, action)
       return false if action.nil?