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

Fix docs links from EE UI items

See merge request gitlab-org/gitlab!35489

doc/customization/issue_and_merge_request_template.md

 ---
-redirect_to: '../user/project/description_templates.md#setting-a-default-template-for-merge-requests-and-issues--starter'
+redirect_to: '../user/project/description_templates.md'
 ---
 
-This document was moved to [description_templates](../user/project/description_templates.md#setting-a-default-template-for-merge-requests-and-issues--starter).
+This document was moved to [description_templates](../user/project/description_templates.md).

doc/user/project/description_templates.md

@@ -81,7 +81,7 @@ changes you made after picking the template and return it to its initial status.
 
 ![Description templates](img/description_templates.png)
 
-## Setting a default template for merge requests and issues  **(STARTER)**
+## Setting a default template for merge requests and issues **(STARTER)**
 
 > - This feature was introduced before [description templates](#overview) and is available in [GitLab Starter](https://about.gitlab.com/pricing/). It can be enabled in the project's settings.
 > - Templates for issues were [introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/28) in GitLab EE 8.1.

ee/app/views/admin/application_settings/_ldap_access_setting.html.haml

@@ -11,7 +11,7 @@
       = _('Lock memberships to LDAP synchronization')
   %span.form-text.text-muted
     = _('If checked, new group memberships and permissions can only be added via LDAP synchronization')
-    = link_to icon('question-circle'), help_page_path('administration/auth/ldap-ee', anchor: 'global-group-memberships-lock')
+    = link_to icon('question-circle'), help_page_path('administration/auth/index.md', anchor: 'global-group-memberships-lock-starter-only')
 
   .form-check
     = form.check_box :allow_group_owners_to_manage_ldap, class: 'form-check-input'

ee/app/views/admin/application_settings/_shared_runners_minutes_setting.html.haml

@@ -3,4 +3,4 @@
   = form.number_field :shared_runners_minutes, class: 'form-control'
   .form-text.text-muted
     = _('Set the maximum number of pipeline minutes that a group can use on shared Runners per month. 0 for unlimited.')
-    = link_to icon('question-circle'), help_page_path("user/admin_area/settings/continuous_integration", anchor: "shared-runners-build-minutes-quota"), target: '_blank'
+    = link_to icon('question-circle'), help_page_path("user/admin_area/settings/continuous_integration", anchor: "shared-runners-pipeline-minutes-quota-starter-only"), target: '_blank'

ee/app/views/namespaces/_shared_runner_status.html.haml

@@ -6,4 +6,4 @@
     %span.light Pipeline minutes quota:
     %strong
       = ci_minutes_report(minutes_quota.monthly_minutes_report)
-      = link_to icon('question-circle'), help_page_path("user/admin_area/settings/continuous_integration", anchor: "shared-runners-build-minutes-quota"), target: '_blank'
+      = link_to icon('question-circle'), help_page_path("user/admin_area/settings/continuous_integration", anchor: "shared-runners-pipeline-minutes-quota-starter-only"), target: '_blank'

ee/app/views/namespaces/_shared_runners_minutes_setting.html.haml

@@ -11,4 +11,4 @@
       Set the maximum number of pipeline minutes that a group can use on shared Runners per month.
       Set 0 for unlimited.
       Set empty to inherit the global setting of #{Gitlab::CurrentSettings.shared_runners_minutes}.
-      = link_to icon('question-circle'), help_page_path("user/admin_area/settings/continuous_integration", anchor: "shared-runners-build-minutes-quota"), target: '_blank'
+      = link_to icon('question-circle'), help_page_path("user/admin_area/settings/continuous_integration", anchor: "shared-runners-pipeline-minutes-quota-starter-only"), target: '_blank'

ee/app/views/namespaces/pipelines_quota/_extra_shared_runners_minutes_quota.html.haml

@@ -8,7 +8,7 @@
     %div
       = ci_minutes_report(minutes_quota.purchased_minutes_report)
       minutes
-      = link_to icon('question-circle'), help_page_path('subscriptions/index', anchor: 'extra-shared-runners-pipeline-minutes'), target: '_blank', rel: 'noopener noreferrer'
+      = link_to icon('question-circle'), help_page_path('subscriptions/index', anchor: 'purchasing-additional-ci-minutes'), target: '_blank', rel: 'noopener noreferrer'
   .col-sm-6.right
     #{minutes_quota.purchased_percent_used}% used
     = ci_minutes_progress_bar(minutes_quota.purchased_percent_used)

ee/app/views/namespaces/pipelines_quota/_list.haml

@@ -24,7 +24,7 @@
       %div
         = ci_minutes_report(minutes_quota.monthly_minutes_report)
         minutes
-        = link_to icon('question-circle'), help_page_path('user/admin_area/settings/continuous_integration', anchor: 'shared-runners-build-minutes-quota'), target: '_blank', 'aria-label': _('Shared runners help link')
+        = link_to icon('question-circle'), help_page_path('user/admin_area/settings/continuous_integration', anchor: 'shared-runners-pipeline-minutes-quota-starter-only'), target: '_blank', 'aria-label': _('Shared runners help link')
 
     .col-sm-6.right
       - if namespace.shared_runners_minutes_limit_enabled?

ee/app/views/projects/_merge_request_approvals_settings_form.html.haml

@@ -64,4 +64,4 @@
       = form.label :require_password_to_approve, class: 'form-check-label' do
         %span= _('Require user password to approve')
         = link_to icon('question-circle'), help_page_path('user/project/merge_requests/merge_request_approvals',
-          anchor: 'require-authentication-when-approving-a-merge-request-starter'), target: '_blank'
+          anchor: 'require-authentication-when-approving-a-merge-request'), target: '_blank'

ee/app/views/projects/_merge_request_settings.html.haml

@@ -12,7 +12,7 @@
   .form-group
     = form.label :merge_requests_template, class: 'label-bold' do
       = _('Default description template for merge requests')
-      = link_to icon('question-circle'), help_page_path('user/project/description_templates', anchor: 'setting-a-default-template-for-issues-and-merge-requests'), target: '_blank'
+      = link_to icon('question-circle'), help_page_path('user/project/description_templates'), target: '_blank'
     = form.text_area :merge_requests_template, class: "form-control", rows: 3
     .text-secondary
       - link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: help_page_path('user/markdown') }

ee/app/views/projects/settings/_default_issue_template.html.haml

@@ -13,7 +13,7 @@
           .form-group.col-md-9
             = f.label :issues_template, class: 'label-bold' do
               = _('Default description template for issues')
-              = link_to icon('question-circle'), help_page_path('user/project/description_templates', anchor: 'setting-a-default-template-for-issues-and-merge-requests'), target: '_blank'
+              = link_to icon('question-circle'), help_page_path('user/project/description_templates'), target: '_blank'
             = f.text_area :issues_template, class: "form-control", rows: 3
             .text-secondary
               - link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: help_page_path('user/markdown') }

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

+---
+title: Update UI links in EE features
+merge_request: 35489
+author:
+type: other