Commit 999c8456 authored by Vitaly Slobodin's avatar Vitaly Slobodin

Merge branch 'docs-redirects-removal-6' into 'master'

Update links to redirected docs

See merge request gitlab-org/gitlab!53004
parents 10f905d8 ff81362b
...@@ -61,7 +61,7 @@ Consider adding checkboxes and expectations of users with certain levels of memb ...@@ -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 <!-- 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 --> * If this feature requires changing permissions, update the permissions document. See https://docs.gitlab.com/ee/user/permissions.html -->
### Availability & Testing ### Availability & Testing
......
...@@ -73,7 +73,7 @@ Consider adding checkboxes and expectations of users with certain levels of memb ...@@ -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 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 * If this feature requires changing permissions, update the permissions document. See https://docs.gitlab.com/ee/user/permissions.html
### Availability & Testing ### Availability & Testing
......
...@@ -15,6 +15,7 @@ import { ...@@ -15,6 +15,7 @@ import {
GlPagination, GlPagination,
} from '@gitlab/ui'; } from '@gitlab/ui';
import { isEmpty } from 'lodash'; import { isEmpty } from 'lodash';
import { helpPagePath } from '~/helpers/help_page_helper';
import AccessorUtils from '~/lib/utils/accessor'; import AccessorUtils from '~/lib/utils/accessor';
import TimeAgo from '~/vue_shared/components/time_ago_tooltip.vue'; import TimeAgo from '~/vue_shared/components/time_ago_tooltip.vue';
import { __ } from '~/locale'; import { __ } from '~/locale';
...@@ -138,6 +139,9 @@ export default { ...@@ -138,6 +139,9 @@ export default {
paginationRequired() { paginationRequired() {
return !isEmpty(this.pagination); return !isEmpty(this.pagination);
}, },
errorTrackingHelpUrl() {
return helpPagePath('operations/error_tracking');
},
}, },
watch: { watch: {
pagination() { pagination() {
...@@ -404,7 +408,7 @@ export default { ...@@ -404,7 +408,7 @@ export default {
<template #description> <template #description>
<div> <div>
<span>{{ __('Monitor your errors by integrating with Sentry.') }}</span> <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') __('More information')
}}</gl-link> }}</gl-link>
</div> </div>
......
---
title: Update links to redirected docs
merge_request: 53004
author:
type: other
...@@ -416,7 +416,7 @@ production: &base ...@@ -416,7 +416,7 @@ production: &base
## Gravatar ## Gravatar
## If using gravatar.com, there's nothing to change here. For Libravatar ## If using gravatar.com, there's nothing to change here. For Libravatar
## you'll need to provide the custom URLs. For more information, ## 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:
# Gravatar/Libravatar URLs: possible placeholders: %{hash} %{size} %{email} %{username} # Gravatar/Libravatar URLs: possible placeholders: %{hash} %{size} %{email} %{username}
# plain_url: "http://..." # default: https://www.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon # plain_url: "http://..." # default: https://www.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon
...@@ -590,7 +590,7 @@ production: &base ...@@ -590,7 +590,7 @@ production: &base
# enabled: true # 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 # 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: feature_flags:
unleash: unleash:
# enabled: false # enabled: false
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
CHANGED_FILES_MESSAGE = <<~MSG 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 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 %<changed_files>s
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
self-managed: true self-managed: true
gitlab-com: true gitlab-com: true
packages: [Free, Premium, Ultimate] 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 image_url: https://about.gitlab.com/images/13_1/alert_management.png
published_at: 2020-06-22 published_at: 2020-06-22
release: 13.1 release: 13.1
......
...@@ -9,6 +9,7 @@ import { ...@@ -9,6 +9,7 @@ import {
GlFormInput, GlFormInput,
GlFormCheckbox, GlFormCheckbox,
} from '@gitlab/ui'; } from '@gitlab/ui';
import { helpPagePath } from '~/helpers/help_page_helper';
import { mapComputed } from '~/vuex_shared/bindings'; import { mapComputed } from '~/vuex_shared/bindings';
import { __, s__ } from '~/locale'; import { __, s__ } from '~/locale';
...@@ -65,6 +66,9 @@ export default { ...@@ -65,6 +66,9 @@ export default {
{ key: 'awsAccessKey', updateFn: 'setStatusPageAccessKey' }, { key: 'awsAccessKey', updateFn: 'setStatusPageAccessKey' },
{ key: 'awsSecretKey', updateFn: 'setStatusPageSecretAccessKey' }, { key: 'awsSecretKey', updateFn: 'setStatusPageSecretAccessKey' },
]), ]),
statusPageHelpUrl() {
return helpPagePath('operations/incident_management/status_page');
},
}, },
methods: { methods: {
...mapActions(['updateStatusPageSettings']), ...mapActions(['updateStatusPageSettings']),
...@@ -91,7 +95,7 @@ export default { ...@@ -91,7 +95,7 @@ export default {
<p> <p>
<gl-sprintf :message="$options.i18n.introText"> <gl-sprintf :message="$options.i18n.introText">
<template #docsLink> <template #docsLink>
<gl-link href="/help/user/project/status_page/index.html"> <gl-link target="_blank" :href="statusPageHelpUrl">
<span>{{ $options.i18n.introLinkText }}</span> <span>{{ $options.i18n.introLinkText }}</span>
</gl-link> </gl-link>
</template> </template>
...@@ -112,7 +116,7 @@ export default { ...@@ -112,7 +116,7 @@ export default {
> >
<gl-form-input id="status-page-url" v-model="url" /> <gl-form-input id="status-page-url" v-model="url" />
<p class="form-text text-muted"> <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 }} {{ $options.i18n.url.linkText }}
</gl-link> </gl-link>
</p> </p>
......
...@@ -15,6 +15,6 @@ ...@@ -15,6 +15,6 @@
= s_('Promotions|Improve milestones with Burndown Charts.') = s_('Promotions|Improve milestones with Burndown Charts.')
%p %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.') = 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' = render 'shared/promotions/promotion_link_project'
...@@ -69,7 +69,8 @@ exports[`Status Page settings form default state should match the default snapsh ...@@ -69,7 +69,8 @@ exports[`Status Page settings form default state should match the default snapsh
class="form-text text-muted" class="form-text text-muted"
> >
<gl-link-stub <gl-link-stub
href="/help/user/project/status_page/index.html" href="/help/operations/incident_management/status_page"
target="_blank"
> >
Status page frontend documentation Status page frontend documentation
......
...@@ -133,7 +133,7 @@ class Feature ...@@ -133,7 +133,7 @@ class Feature
# This method is called from config/initializers/flipper.rb and can be used # This method is called from config/initializers/flipper.rb and can be used
# to register Flipper groups. # 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 def register_feature_groups
end end
......
...@@ -40,14 +40,14 @@ verify:jdk8: ...@@ -40,14 +40,14 @@ verify:jdk8:
<<: *verify <<: *verify
# To deploy packages from CI, create a ci_settings.xml file # 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. # Please note: The GitLab Maven Repository is currently only available in GitLab Premium / Ultimate.
# For `master` branch run `mvn deploy` automatically. # For `master` branch run `mvn deploy` automatically.
deploy:jdk8: deploy:jdk8:
stage: deploy stage: deploy
script: script:
- if [ ! -f ci_settings.xml ]; - 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 fi
- 'mvn $MAVEN_CLI_OPTS deploy -s ci_settings.xml' - 'mvn $MAVEN_CLI_OPTS deploy -s ci_settings.xml'
only: only:
......
# 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. # Configure the scanning tool through the environment variables.
# List of the variables: https://gitlab.com/gitlab-org/security-products/analyzers/license-finder#settings # List of the variables: https://gitlab.com/gitlab-org/security-products/analyzers/license-finder#settings
......
...@@ -216,7 +216,7 @@ run all the tests in the `Test::Instance::All` scenario, and then enable the ...@@ -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. feature flag again if it was enabled earlier.
Note: the QA framework doesn't currently allow you to easily toggle a feature 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). 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` Note also that the `--` separator isn't used because `--enable-feature` and `--disable-feature`
......
...@@ -298,9 +298,7 @@ describe('ErrorTrackingList', () => { ...@@ -298,9 +298,7 @@ describe('ErrorTrackingList', () => {
}); });
it('shows empty state', () => { it('shows empty state', () => {
expect(wrapper.find('a').attributes('href')).toBe( expect(wrapper.find(GlEmptyState).isVisible()).toBe(true);
'/help/user/project/operations/error_tracking.html',
);
}); });
}); });
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment