diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-20 13:00:54 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-20 13:00:54 +0300 |
commit | 3cccd102ba543e02725d247893729e5c73b38295 (patch) | |
tree | f36a04ec38517f5deaaacb5acc7d949688d1e187 /app/assets/javascripts/clusters_list/components/agent_token.vue | |
parent | 205943281328046ef7b4528031b90fbda70c75ac (diff) |
Add latest changes from gitlab-org/gitlab@14-10-stable-eev14.10.0-rc42
Diffstat (limited to 'app/assets/javascripts/clusters_list/components/agent_token.vue')
-rw-r--r-- | app/assets/javascripts/clusters_list/components/agent_token.vue | 35 |
1 files changed, 10 insertions, 25 deletions
diff --git a/app/assets/javascripts/clusters_list/components/agent_token.vue b/app/assets/javascripts/clusters_list/components/agent_token.vue index eab3fc3ed63..751ad9795dd 100644 --- a/app/assets/javascripts/clusters_list/components/agent_token.vue +++ b/app/assets/javascripts/clusters_list/components/agent_token.vue @@ -8,11 +8,8 @@ import { I18N_AGENT_TOKEN } from '../constants'; export default { i18n: I18N_AGENT_TOKEN, - basicInstallPath: helpPagePath('user/clusters/agent/install/index', { - anchor: 'install-the-agent-into-the-cluster', - }), advancedInstallPath: helpPagePath('user/clusters/agent/install/index', { - anchor: 'advanced-installation', + anchor: 'advanced-installation-method', }), components: { GlAlert, @@ -43,27 +40,7 @@ export default { <template> <div> - <p> - <strong>{{ $options.i18n.tokenTitle }}</strong> - </p> - - <p> - <gl-sprintf :message="$options.i18n.tokenBody"> - <template #link="{ content }"> - <gl-link :href="$options.basicInstallPath" target="_blank"> {{ content }}</gl-link> - </template> - </gl-sprintf> - </p> - - <p> - <gl-alert - :title="$options.i18n.tokenSingleUseWarningTitle" - variant="warning" - :dismissible="false" - > - {{ $options.i18n.tokenSingleUseWarningBody }} - </gl-alert> - </p> + <p class="gl-mb-3">{{ $options.i18n.tokenLabel }}</p> <p> <gl-form-input-group readonly :value="agentToken" :select-on-click="true"> @@ -78,6 +55,14 @@ export default { </p> <p> + {{ $options.i18n.tokenSubtitle }} + </p> + + <gl-alert :dismissible="false" variant="warning" class="gl-mb-5"> + {{ $options.i18n.tokenSingleUseWarningTitle }} + </gl-alert> + + <p> <strong>{{ $options.i18n.basicInstallTitle }}</strong> </p> |