Merge branch 'fix-broken-links' into 'master'

Fix broken links

See merge request gitlab-org/gitlab!22253

app/views/admin/application_settings/_usage.html.haml

@@ -9,7 +9,7 @@
           Enable version check
         .form-text.text-muted
           GitLab will inform you if a new version is available.
-          = link_to 'Learn more', help_page_path("user/admin_area/settings/usage_statistics", anchor: "version-check")
+          = link_to 'Learn more', help_page_path('user/admin_area/settings/usage_statistics', anchor: 'version-check-core-only')
           about what information is shared with GitLab Inc.
     .form-group
       - can_be_configured = @application_setting.usage_ping_can_be_configured?
@@ -21,7 +21,7 @@
           - if can_be_configured
             %p.mb-2= _('To help improve GitLab and its user experience, GitLab will periodically collect usage information.')
 
-            - usage_ping_path = help_page_path('user/admin_area/settings/usage_statistics', anchor: 'usage-ping')
+            - usage_ping_path = help_page_path('user/admin_area/settings/usage_statistics', anchor: 'usage-ping-core-only')
             - usage_ping_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: usage_ping_path }
             %p.mb-2= s_('%{usage_ping_link_start}Learn more%{usage_ping_link_end} about what information is shared with GitLab Inc.').html_safe % { usage_ping_link_start: usage_ping_link_start, usage_ping_link_end: '</a>'.html_safe }
 

app/views/instance_statistics/cohorts/index.html.haml

@@ -9,6 +9,6 @@
       - usage_ping_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: usage_ping_path }
       = s_('User Cohorts are only shown when the %{usage_ping_link_start}usage ping%{usage_ping_link_end} is enabled.').html_safe % { usage_ping_link_start: usage_ping_link_start, usage_ping_link_end: '</a>'.html_safe }
       - if current_user.admin?
-        - application_settings_path = admin_application_settings_path(anchor: 'usage-statistics')
+        - application_settings_path = metrics_and_profiling_admin_application_settings_path(anchor: 'js-usage-settings')
         - application_settings_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: application_settings_path }
         = s_('To enable it and see User Cohorts, visit %{application_settings_link_start}application settings%{application_settings_link_end}.').html_safe % { application_settings_link_start: application_settings_link_start, application_settings_link_end: '</a>'.html_safe }

app/views/shared/_ping_consent.html.haml

 - if session[:ask_for_usage_stats_consent]
   .ping-consent-message.alert.alert-warning.flex-alert
-    - settings_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer" class="alert-link">'.html_safe % { url: admin_application_settings_path(anchor: 'js-usage-settings') }
+    - settings_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer" class="alert-link">'.html_safe % { url: metrics_and_profiling_admin_application_settings_path(anchor: 'js-usage-settings') }
     - info_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer" class="alert-link">'.html_safe % { url: help_page_path('user/admin_area/settings/usage_statistics.md') }
     .alert-message
       = s_('To help improve GitLab, we would like to periodically collect usage information. This can be changed at any time in %{settings_link_start}Settings%{link_end}. %{info_link_start}More Information%{link_end}').html_safe % { settings_link_start: settings_link_start, info_link_start: info_link_start, link_end: '</a>'.html_safe }

ee/app/views/admin/dashboard/_elastic_and_geo.html.haml

 = feature_entry(_('Elasticsearch'),
-  href: admin_application_settings_path(anchor: 'js-elasticsearch-settings'),
+  href: integrations_admin_application_settings_path(anchor: 'js-elasticsearch-settings'),
   doc_href: help_page_path('integration/elasticsearch'),
   enabled: Gitlab::CurrentSettings.elasticsearch_search?)