diff --git a/.gitlab/issue_templates/Feature proposal.md b/.gitlab/issue_templates/Feature proposal.md index 98cf778f196aeffaf12b9372cd9076617444d74e..1090a04ad36ad877cc94d1be0525ef131903b043 100644 --- a/.gitlab/issue_templates/Feature proposal.md +++ b/.gitlab/issue_templates/Feature proposal.md @@ -61,7 +61,7 @@ Consider adding checkboxes and expectations of users with certain levels of memb <!-- See the Feature Change Documentation Workflow https://docs.gitlab.com/ee/development/documentation/workflow.html#for-a-product-change -* Add all known Documentation Requirements in this section. See https://docs.gitlab.com/ee/development/documentation/feature-change-workflow.html#documentation-requirements +* Add all known Documentation Requirements in this section. See https://docs.gitlab.com/ee/development/documentation/workflow.html * If this feature requires changing permissions, update the permissions document. See https://docs.gitlab.com/ee/user/permissions.html --> ### Availability & Testing diff --git a/.gitlab/issue_templates/Lean Feature Proposal.md b/.gitlab/issue_templates/Lean Feature Proposal.md index c1db9356fa43af8640484972a90655dbacdd6ddd..a1f217fc624f3e2fe625d77817a34a997e3fb789 100644 --- a/.gitlab/issue_templates/Lean Feature Proposal.md +++ b/.gitlab/issue_templates/Lean Feature Proposal.md @@ -73,7 +73,7 @@ Consider adding checkboxes and expectations of users with certain levels of memb See the Feature Change Documentation Workflow https://docs.gitlab.com/ee/development/documentation/workflow.html#for-a-product-change -* Add all known Documentation Requirements in this section. See https://docs.gitlab.com/ee/development/documentation/feature-change-workflow.html#documentation-requirements +* Add all known Documentation Requirements in this section. See https://docs.gitlab.com/ee/development/documentation/workflow.html * If this feature requires changing permissions, update the permissions document. See https://docs.gitlab.com/ee/user/permissions.html ### Availability & Testing diff --git a/app/assets/javascripts/error_tracking/components/error_tracking_list.vue b/app/assets/javascripts/error_tracking/components/error_tracking_list.vue index b712c8d6e85502fb538bc837c5cef0941377a7ca..04efd9fff40f61d57ce4eb828fedb6ad5a4b27cb 100644 --- a/app/assets/javascripts/error_tracking/components/error_tracking_list.vue +++ b/app/assets/javascripts/error_tracking/components/error_tracking_list.vue @@ -15,6 +15,7 @@ import { GlPagination, } from '@gitlab/ui'; import { isEmpty } from 'lodash'; +import { helpPagePath } from '~/helpers/help_page_helper'; import AccessorUtils from '~/lib/utils/accessor'; import TimeAgo from '~/vue_shared/components/time_ago_tooltip.vue'; import { __ } from '~/locale'; @@ -138,6 +139,9 @@ export default { paginationRequired() { return !isEmpty(this.pagination); }, + errorTrackingHelpUrl() { + return helpPagePath('operations/error_tracking'); + }, }, watch: { pagination() { @@ -404,7 +408,7 @@ export default { <template #description> <div> <span>{{ __('Monitor your errors by integrating with Sentry.') }}</span> - <gl-link target="_blank" href="/help/user/project/operations/error_tracking.html">{{ + <gl-link target="_blank" :href="errorTrackingHelpUrl">{{ __('More information') }}</gl-link> </div> diff --git a/changelogs/unreleased/docs-redirects-removal-6.yml b/changelogs/unreleased/docs-redirects-removal-6.yml new file mode 100644 index 0000000000000000000000000000000000000000..f03d5df1442d8504bb9dd8886b7d98079c155874 --- /dev/null +++ b/changelogs/unreleased/docs-redirects-removal-6.yml @@ -0,0 +1,5 @@ +--- +title: Update links to redirected docs +merge_request: 53004 +author: +type: other diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 29b60aa91c5dabfda999a396636ab5d36e6fa987..65627b0e166a2eca974fa0ae11d7292cda3a6506 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -416,7 +416,7 @@ production: &base ## Gravatar ## If using gravatar.com, there's nothing to change here. For Libravatar ## you'll need to provide the custom URLs. For more information, - ## see: https://docs.gitlab.com/ee/customization/libravatar.html + ## see: https://docs.gitlab.com/ee/administration/libravatar.html gravatar: # Gravatar/Libravatar URLs: possible placeholders: %{hash} %{size} %{email} %{username} # plain_url: "http://..." # default: https://www.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon @@ -590,7 +590,7 @@ production: &base # enabled: true # primary_api_url: http://localhost:5000/ # internal address to the primary registry, will be used by GitLab to directly communicate with primary registry API - ## Feature Flag https://docs.gitlab.com/ee/user/project/operations/feature_flags.html + ## Feature Flag https://docs.gitlab.com/ee/operations/feature_flags.html feature_flags: unleash: # enabled: false diff --git a/danger/product_intelligence/Dangerfile b/danger/product_intelligence/Dangerfile index 89c3e969bdfd94fa0f7f0a4295a5e97ce563084f..1a53b485093fd758f58523aee54b408fd978b0da 100644 --- a/danger/product_intelligence/Dangerfile +++ b/danger/product_intelligence/Dangerfile @@ -3,7 +3,7 @@ CHANGED_FILES_MESSAGE = <<~MSG For the following files, a review from the [Data team and Product Intelligence team](https://gitlab.com/groups/gitlab-org/growth/product-intelligence/engineers/-/group_members?with_inherited_permissions=exclude) is recommended -Please check the ~"product intelligence" [guide](https://docs.gitlab.com/ee/development/product_analytics/usage_ping.html) and reach out to %<engineers_group>s group for a review. +Please check the ~"product intelligence" [guide](https://docs.gitlab.com/ee/development/usage_ping.html) and reach out to %<engineers_group>s group for a review. %<changed_files>s diff --git a/data/whats_new/202008180003_13_01.yml b/data/whats_new/202008180003_13_01.yml index dd132c50806ef53faccd703017228d896d9233ac..9f8a87ebe27d138b26ba448a37c7e480afd36c4b 100644 --- a/data/whats_new/202008180003_13_01.yml +++ b/data/whats_new/202008180003_13_01.yml @@ -8,7 +8,7 @@ self-managed: true gitlab-com: true packages: [Free, Premium, Ultimate] - url: https://docs.gitlab.com/ee/user/project/operations/alert_management.html + url: https://docs.gitlab.com/ee/operations/incident_management/index.html image_url: https://about.gitlab.com/images/13_1/alert_management.png published_at: 2020-06-22 release: 13.1 diff --git a/ee/app/assets/javascripts/status_page_settings/components/settings_form.vue b/ee/app/assets/javascripts/status_page_settings/components/settings_form.vue index bd523373a7579e3ce4ddebdb308362ff7a7a91d4..93c350bb384121195157c2639ebaade975ecb7dd 100644 --- a/ee/app/assets/javascripts/status_page_settings/components/settings_form.vue +++ b/ee/app/assets/javascripts/status_page_settings/components/settings_form.vue @@ -9,6 +9,7 @@ import { GlFormInput, GlFormCheckbox, } from '@gitlab/ui'; +import { helpPagePath } from '~/helpers/help_page_helper'; import { mapComputed } from '~/vuex_shared/bindings'; import { __, s__ } from '~/locale'; @@ -65,6 +66,9 @@ export default { { key: 'awsAccessKey', updateFn: 'setStatusPageAccessKey' }, { key: 'awsSecretKey', updateFn: 'setStatusPageSecretAccessKey' }, ]), + statusPageHelpUrl() { + return helpPagePath('operations/incident_management/status_page'); + }, }, methods: { ...mapActions(['updateStatusPageSettings']), @@ -91,7 +95,7 @@ export default { <p> <gl-sprintf :message="$options.i18n.introText"> <template #docsLink> - <gl-link href="/help/user/project/status_page/index.html"> + <gl-link target="_blank" :href="statusPageHelpUrl"> <span>{{ $options.i18n.introLinkText }}</span> </gl-link> </template> @@ -112,7 +116,7 @@ export default { > <gl-form-input id="status-page-url" v-model="url" /> <p class="form-text text-muted"> - <gl-link href="/help/user/project/status_page/index.html"> + <gl-link target="_blank" :href="statusPageHelpUrl"> {{ $options.i18n.url.linkText }} </gl-link> </p> diff --git a/ee/app/views/shared/promotions/_promote_burndown_charts.html.haml b/ee/app/views/shared/promotions/_promote_burndown_charts.html.haml index 9fff155dbb2ebc9bf7eb4e481b034a482da7410a..43423078423561ffd5cf953e42529ad6fa94b76b 100644 --- a/ee/app/views/shared/promotions/_promote_burndown_charts.html.haml +++ b/ee/app/views/shared/promotions/_promote_burndown_charts.html.haml @@ -15,6 +15,6 @@ = s_('Promotions|Improve milestones with Burndown Charts.') %p = s_('Promotions|Burndown Charts are visual representations of the progress of completing a milestone. At a glance, you see the current state for the completion a given milestone. Without them, you would have to organize the data from the milestone and plot it yourself to have the same sense of progress.') - = link_to _('Read more'), help_page_path('user/project/milestones/burndown_charts.md'), target: '_blank' + = link_to _('Read more'), help_page_path('user/project/milestones/burndown_and_burnup_charts.md'), target: '_blank' = render 'shared/promotions/promotion_link_project' diff --git a/ee/spec/frontend/status_page_settings/__snapshots__/settings_form_spec.js.snap b/ee/spec/frontend/status_page_settings/__snapshots__/settings_form_spec.js.snap index 60b0391c1ae79f7a272eefcf89216e3a5bb25241..6be86fa7533e93704bfbb78a0b949682342a8bcf 100644 --- a/ee/spec/frontend/status_page_settings/__snapshots__/settings_form_spec.js.snap +++ b/ee/spec/frontend/status_page_settings/__snapshots__/settings_form_spec.js.snap @@ -69,7 +69,8 @@ exports[`Status Page settings form default state should match the default snapsh class="form-text text-muted" > <gl-link-stub - href="/help/user/project/status_page/index.html" + href="/help/operations/incident_management/status_page" + target="_blank" > Status page frontend documentation diff --git a/lib/feature.rb b/lib/feature.rb index 3d4a919b043759ec675b5adf34f8ca8fd0299531..7c926b255873319b9699014b3b962514bc55a1ad 100644 --- a/lib/feature.rb +++ b/lib/feature.rb @@ -133,7 +133,7 @@ def reset # This method is called from config/initializers/flipper.rb and can be used # to register Flipper groups. - # See https://docs.gitlab.com/ee/development/feature_flags.html#feature-groups + # See https://docs.gitlab.com/ee/development/feature_flags/index.html def register_feature_groups end diff --git a/lib/gitlab/ci/templates/Maven.gitlab-ci.yml b/lib/gitlab/ci/templates/Maven.gitlab-ci.yml index 84bb0ff3b33d8952a6b8b6f1efd45b5e7fbe71e1..8f64da244101aab8cda7c108fcc9e325d1dbd675 100644 --- a/lib/gitlab/ci/templates/Maven.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Maven.gitlab-ci.yml @@ -40,14 +40,14 @@ verify:jdk8: <<: *verify # To deploy packages from CI, create a ci_settings.xml file -# For deploying packages to GitLab's Maven Repository: See https://docs.gitlab.com/ee/user/project/packages/maven_repository.html#creating-maven-packages-with-gitlab-cicd for more details. +# For deploying packages to GitLab's Maven Repository: See https://docs.gitlab.com/ee/user/packages/maven_repository/index.html#create-maven-packages-with-gitlab-cicd for more details. # Please note: The GitLab Maven Repository is currently only available in GitLab Premium / Ultimate. # For `master` branch run `mvn deploy` automatically. deploy:jdk8: stage: deploy script: - if [ ! -f ci_settings.xml ]; - then echo "CI settings missing\! If deploying to GitLab Maven Repository, please see https://docs.gitlab.com/ee/user/project/packages/maven_repository.html#creating-maven-packages-with-gitlab-cicd for instructions."; + then echo "CI settings missing\! If deploying to GitLab Maven Repository, please see https://docs.gitlab.com/ee/user/packages/maven_repository/index.html#create-maven-packages-with-gitlab-cicd for instructions."; fi - 'mvn $MAVEN_CLI_OPTS deploy -s ci_settings.xml' only: diff --git a/lib/gitlab/ci/templates/Security/License-Scanning.gitlab-ci.yml b/lib/gitlab/ci/templates/Security/License-Scanning.gitlab-ci.yml index 63237e413769e597eb9b36b8ab47e20709d2bdcf..face4d3af012efd585e3ed1a2d64d99ed4abba2c 100644 --- a/lib/gitlab/ci/templates/Security/License-Scanning.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Security/License-Scanning.gitlab-ci.yml @@ -1,4 +1,4 @@ -# Read more about this feature here: https://docs.gitlab.com/ee/user/application_security/license_compliance/ +# Read more about this feature here: https://docs.gitlab.com/ee/user/compliance/license_compliance/index.html # # Configure the scanning tool through the environment variables. # List of the variables: https://gitlab.com/gitlab-org/security-products/analyzers/license-finder#settings diff --git a/qa/README.md b/qa/README.md index f959acbc366bdf351c7579cda81ca84374bb3a96..02fa84f4488eaf19b26220b679b91a55f49294cf 100644 --- a/qa/README.md +++ b/qa/README.md @@ -216,7 +216,7 @@ run all the tests in the `Test::Instance::All` scenario, and then enable the feature flag again if it was enabled earlier. Note: the QA framework doesn't currently allow you to easily toggle a feature -flag during a single test, [as you can in unit tests](https://docs.gitlab.com/ee/development/feature_flags.html#specs), +flag during a single test, [as you can in unit tests](https://docs.gitlab.com/ee/development/feature_flags/index.html), but [that capability is planned](https://gitlab.com/gitlab-org/quality/team-tasks/issues/77). Note also that the `--` separator isn't used because `--enable-feature` and `--disable-feature` diff --git a/spec/frontend/error_tracking/components/error_tracking_list_spec.js b/spec/frontend/error_tracking/components/error_tracking_list_spec.js index d41233a6b725cfd2141993c3e629d8ffdedede42..034e87c0cf30df0f94b6f1046c2367d06fe1fe5b 100644 --- a/spec/frontend/error_tracking/components/error_tracking_list_spec.js +++ b/spec/frontend/error_tracking/components/error_tracking_list_spec.js @@ -298,9 +298,7 @@ describe('ErrorTrackingList', () => { }); it('shows empty state', () => { - expect(wrapper.find('a').attributes('href')).toBe( - '/help/user/project/operations/error_tracking.html', - ); + expect(wrapper.find(GlEmptyState).isVisible()).toBe(true); }); });