Merge branch 'docs-links-from-ui-2' into 'master'

Update UI links to docs in core features 2

See merge request gitlab-org/gitlab!36174

app/helpers/jobs_helper.rb

@@ -5,8 +5,8 @@ module JobsHelper
     {
       "endpoint" => project_job_path(@project, @build, format: :json),
       "project_path" => @project.full_path,
-      "deployment_help_url" => help_page_path('user/project/clusters/index.md', anchor: 'troubleshooting-failed-deployment-jobs'),
-      "runner_help_url" => help_page_path('ci/runners/README.md', anchor: 'setting-maximum-job-timeout-for-a-runner'),
+      "deployment_help_url" => help_page_path('user/project/clusters/index.md', anchor: 'troubleshooting'),
+      "runner_help_url" => help_page_path('ci/runners/README.md', anchor: 'set-maximum-job-timeout-for-a-runner'),
       "runner_settings_url" => project_runners_path(@build.project, anchor: 'js-runners-settings'),
       "variables_settings_url" => project_variables_path(@build.project, anchor: 'js-cicd-variables-settings'),
       "page_path" => project_job_path(@project, @build),

app/helpers/projects_helper.rb

@@ -180,7 +180,7 @@ module ProjectsHelper
   end
 
   def link_to_autodeploy_doc
-    link_to _('About auto deploy'), help_page_path('autodevops/index.md#auto-deploy'), target: '_blank'
+    link_to _('About auto deploy'), help_page_path('topics/autodevops/stages.md', anchor: 'auto-deploy'), target: '_blank'
   end
 
   def autodeploy_flash_notice(branch_name)

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

@@ -31,7 +31,7 @@
             %pre.usage-data.js-usage-ping-payload.js-syntax-highlight.code.highlight.mt-2.d-none{ data: { endpoint: usage_data_admin_application_settings_path(format: :html) } }
           - else
             = _('The usage ping is disabled, and cannot be configured through this form.')
-            - deactivating_usage_ping_path = help_page_path('user/admin_area/settings/usage_statistics', anchor: 'deactivate-the-usage-ping')
+            - deactivating_usage_ping_path = help_page_path('development/telemetry/usage_ping', anchor: 'disable-usage-ping')
             - deactivating_usage_ping_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: deactivating_usage_ping_path }
             = s_('For more information, see the documentation on %{deactivating_usage_ping_link_start}deactivating the usage ping%{deactivating_usage_ping_link_end}.').html_safe % { deactivating_usage_ping_link_start: deactivating_usage_ping_link_start, deactivating_usage_ping_link_end: '</a>'.html_safe }
     .form-group.mt-3

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

@@ -9,7 +9,7 @@
     .settings-content
       - if ci_variable_protected_by_default?
         %p.settings-message.text-center
-          - link_start = '<a href="%{url}">'.html_safe % { url: help_page_path('ci/variables/README', anchor: 'protected-variables') }
+          - link_start = '<a href="%{url}">'.html_safe % { url: help_page_path('ci/variables/README', anchor: 'protect-a-custom-variable') }
           = s_('Environment variables on this GitLab instance are configured to be %{link_start}protected%{link_end} by default').html_safe % { link_start: link_start, link_end: '</a>'.html_safe }
       #js-instance-variables{ data: { endpoint: admin_ci_variables_path, group: 'true', maskable_regex: ci_variable_maskable_regex, protected_by_default: ci_variable_protected_by_default?.to_s} }
 

app/views/ci/variables/_index.html.haml

@@ -2,7 +2,7 @@
 
 - if ci_variable_protected_by_default?
   %p.settings-message.text-center
-    - link_start = '<a href="%{url}">'.html_safe % { url: help_page_path('ci/variables/README', anchor: 'protected-variables') }
+    - link_start = '<a href="%{url}">'.html_safe % { url: help_page_path('ci/variables/README', anchor: 'protect-a-custom-variable') }
     = s_('Environment variables are configured by your administrator to be %{link_start}protected%{link_end} by default').html_safe % { link_start: link_start, link_end: '</a>'.html_safe }
 
 - if Feature.enabled?(:new_variables_ui, @project || @group, default_enabled: true)

app/views/clusters/clusters/aws/_new.html.haml

 - if !Gitlab::CurrentSettings.eks_integration_enabled?
-  - documentation_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: help_page_path('user/project/clusters/add_remove_clusters.md',
-      anchor: 'additional-requirements-for-self-managed-instances') }
+  - documentation_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: help_page_path('user/project/clusters/add_eks_clusters.md',
+      anchor: 'additional-requirements-for-self-managed-instances-core-only') }
   = s_('Amazon authentication is not %{link_start}correctly configured%{link_end}. Ask your GitLab administrator if you want to use this service.').html_safe % { link_start: documentation_link_start, link_end: '<a/>'.html_safe }
 - else
   .js-create-eks-cluster-form-container{ data: { 'gitlab-managed-cluster-help-path' => help_page_path('user/project/clusters/index.md', anchor: 'gitlab-managed-clusters'),

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

@@ -6,7 +6,7 @@
 - else
   .bs-callout.bs-callout-warning.clearfix
     %p
-      - usage_ping_path = help_page_path('user/admin_area/settings/usage_statistics', anchor: 'usage-ping')
+      - usage_ping_path = help_page_path('development/telemetry/usage_ping')
       - 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?

app/views/instance_statistics/dev_ops_score/_disabled.html.haml

@@ -4,7 +4,7 @@
     %h4= _('Usage ping is not enabled')
     - if !current_user.admin?
       %p
-        - usage_ping_path = help_page_path('user/admin_area/settings/usage_statistics', anchor: 'usage-ping')
+        - usage_ping_path = help_page_path('development/telemetry/usage_ping')
         - usage_ping_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: usage_ping_path }
         = s_('In order to enable instance-level analytics, please ask an admin to enable %{usage_ping_link_start}usage ping%{usage_ping_link_end}.').html_safe % { usage_ping_link_start: usage_ping_link_start, usage_ping_link_end: '</a>'.html_safe }
     - if current_user.admin?

app/views/profiles/keys/index.html.haml

@@ -12,7 +12,7 @@
       = _('Add an SSH key')
     %p.profile-settings-content
       - generate_link_url = help_page_path("ssh/README", anchor: 'generating-a-new-ssh-key-pair')
-      - existing_link_url = help_page_path("ssh/README", anchor: 'locating-an-existing-ssh-key-pair')
+      - existing_link_url = help_page_path("ssh/README", anchor: 'review-existing-ssh-keys')
       - generate_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: generate_link_url }
       - existing_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: existing_link_url }
       = _('To add an SSH key you need to %{generate_link_start}generate one%{link_end} or use an %{existing_link_start}existing key%{link_end}.').html_safe % { generate_link_start: generate_link_start, existing_link_start: existing_link_start, link_end: '</a>'.html_safe }

app/views/projects/tags/new.html.haml

@@ -40,7 +40,7 @@
         - link_start = '<a href="%{url}" rel="noopener noreferrer" target="_blank">'.html_safe
         - releases_page_path = project_releases_path(@project)
         - releases_page_link_start = link_start % { url: releases_page_path }
-        - docs_url = help_page_path('user/project/releases/index.md', anchor: 'creating-a-release')
+        - docs_url = help_page_path('user/project/releases/index.md', anchor: 'create-a-release')
         - docs_link_start = link_start % { url: docs_url }
         - link_end = '</a>'.html_safe
         - replacements = { releases_page_link_start: releases_page_link_start, docs_link_start: docs_link_start, link_end: link_end }

changelogs/unreleased/docs-links-from-ui-2.yml

+---
+title: Update more UI links to docs in core features
+merge_request: 36174
+author:
+type: other