Add latest changes from gitlab-org/gitlab@15-8-stable-eev15.8.0-rc42

2 files changed, 10 insertions, 4 deletions

diff --git a/app/helpers/groups/group_members_helper.rb b/app/helpers/groups/group_members_helper.rb
index 5034a4cb9b4..60011e31d43 100644
--- a/app/helpers/groups/group_members_helper.rb
+++ b/app/helpers/groups/group_members_helper.rb
@@ -13,7 +13,9 @@ module Groups::GroupMembersHelper
       access_request: group_members_list_data(group, access_requests.nil? ? [] : access_requests),
       source_id: group.id,
       can_manage_members: can?(current_user, :admin_group_member, group),
-      can_manage_access_requests: can?(current_user, :admin_member_access_request, group)
+      can_manage_access_requests: can?(current_user, :admin_member_access_request, group),
+      group_name: group.name,
+      group_path: group.full_path
     }
   end
 
diff --git a/app/helpers/groups/observability_helper.rb b/app/helpers/groups/observability_helper.rb
index 26caac4ce7f..6cd6566cee1 100644
--- a/app/helpers/groups/observability_helper.rb
+++ b/app/helpers/groups/observability_helper.rb
@@ -5,15 +5,19 @@ module Groups
     ACTION_TO_PATH = {
       'dashboards' => {
         path: '/',
-        title: -> { _('Dashboards') }
+        title: -> { s_('Observability|Dashboards') }
       },
       'manage' => {
         path: '/dashboards',
-        title: -> { _('Manage Dashboards') }
+        title: -> { s_('Observability|Manage dashboards') }
       },
       'explore' => {
         path: '/explore',
-        title: -> { _('Explore') }
+        title: -> { s_('Observability|Explore telemetry data') }
+      },
+      'datasources' => {
+        path: '/datasources',
+        title: -> { s_('Observability|Data sources') }
       }
     }.freeze