Add latest changes from gitlab-org/gitlab@15-7-stable-eev15.7.0-rc42

2 files changed, 5 insertions, 5 deletions

diff --git a/app/helpers/groups/observability_helper.rb b/app/helpers/groups/observability_helper.rb
index 6fb6acce386..26caac4ce7f 100644
--- a/app/helpers/groups/observability_helper.rb
+++ b/app/helpers/groups/observability_helper.rb
@@ -5,15 +5,15 @@ module Groups
     ACTION_TO_PATH = {
       'dashboards' => {
         path: '/',
-        title: -> { s_('Dashboards') }
+        title: -> { _('Dashboards') }
       },
       'manage' => {
         path: '/dashboards',
-        title: -> { s_('Manage Dashboards') }
+        title: -> { _('Manage Dashboards') }
       },
       'explore' => {
         path: '/explore',
-        title: -> { s_('Explore') }
+        title: -> { _('Explore') }
       }
     }.freeze
 
@@ -22,7 +22,7 @@ module Groups
 
       # When running Observability UI in standalone mode (i.e. not backed by Observability Backend)
       # the group-id is not required. This is mostly used for local dev
-      base_url = ENV['STANDALONE_OBSERVABILITY_UI'] == 'true' ? observability_url : "#{observability_url}/#{group.id}"
+      base_url = ENV['STANDALONE_OBSERVABILITY_UI'] == 'true' ? observability_url : "#{observability_url}/-/#{group.id}"
 
       sanitized_path = if params[:observability_path] && sanitize(params[:observability_path]) != ''
                          CGI.unescapeHTML(sanitize(params[:observability_path]))
diff --git a/app/helpers/groups/settings_helper.rb b/app/helpers/groups/settings_helper.rb
index 1b391680996..38300043dd7 100644
--- a/app/helpers/groups/settings_helper.rb
+++ b/app/helpers/groups/settings_helper.rb
@@ -9,7 +9,7 @@ module Groups
         remove_form_id: remove_form_id,
         button_text: _('Remove group'),
         button_testid: 'remove-group-button',
-        disabled: group.paid?.to_s,
+        disabled: group.prevent_delete?.to_s,
         confirm_danger_message: remove_group_message(group),
         phrase: group.full_path
       }