diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2024-01-03 21:12:53 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2024-01-03 21:12:53 +0300 |
commit | b87af16bf2b9b09309deb902889edc1bff05256a (patch) | |
tree | c1088a650a2c26fb9636ad2d01744697caf80091 /app/assets | |
parent | 5429e3d4e0d5f1601ff8989bcb26bd822b3c7c5a (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/javascripts/environments/components/stop_environment_modal.vue | 8 | ||||
-rw-r--r-- | app/assets/javascripts/persistent_user_callouts.js | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/app/assets/javascripts/environments/components/stop_environment_modal.vue b/app/assets/javascripts/environments/components/stop_environment_modal.vue index b583694e154..76fa0c9bcb2 100644 --- a/app/assets/javascripts/environments/components/stop_environment_modal.vue +++ b/app/assets/javascripts/environments/components/stop_environment_modal.vue @@ -1,13 +1,15 @@ <script> import { GlSprintf, GlTooltipDirective, GlModal } from '@gitlab/ui'; import { __, s__ } from '~/locale'; -import { DOCS_URL_IN_EE_DIR } from 'jh_else_ce/lib/utils/url_utility'; +import { helpPagePath } from '~/helpers/help_page_helper'; import eventHub from '../event_hub'; import stopEnvironmentMutation from '../graphql/mutations/stop_environment.mutation.graphql'; export default { - yamlDocsLink: `${DOCS_URL_IN_EE_DIR}/ee/ci/yaml/`, - stoppingEnvironmentDocsLink: `${DOCS_URL_IN_EE_DIR}/environments/#stopping-an-environment`, + yamlDocsLink: helpPagePath('ci/yaml/index'), + stoppingEnvironmentDocsLink: helpPagePath('ci/environments/index', { + anchor: 'stopping-an-environment', + }), id: 'stop-environment-modal', name: 'StopEnvironmentModal', diff --git a/app/assets/javascripts/persistent_user_callouts.js b/app/assets/javascripts/persistent_user_callouts.js index 7420542a065..95ef04ceb30 100644 --- a/app/assets/javascripts/persistent_user_callouts.js +++ b/app/assets/javascripts/persistent_user_callouts.js @@ -24,7 +24,7 @@ const PERSISTENT_USER_CALLOUTS = [ '.js-branch-rules-info-callout', '.js-new-nav-for-everyone-callout', '.js-namespace-over-storage-users-combined-alert', - '.js-code-suggestions-ga-non-owner-alert', + '.js-code-suggestions-ga-alert', ]; const initCallouts = () => { |