diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-10 09:10:31 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-10 09:10:31 +0300 |
commit | bef328bb8c0e287ecd68e21bae40bdb335971212 (patch) | |
tree | 3d867e67eb59e127e5bf7c80e34a6be6b5226428 /app | |
parent | aaa0fba8208ac74b34c2f87dde13611656fe7df6 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/clusters_list/components/install_agent_modal.vue | 4 | ||||
-rw-r--r-- | app/assets/javascripts/feature_flags/components/configure_feature_flags_modal.vue | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/app/assets/javascripts/clusters_list/components/install_agent_modal.vue b/app/assets/javascripts/clusters_list/components/install_agent_modal.vue index 5f192fe4d5a..28da1e146c6 100644 --- a/app/assets/javascripts/clusters_list/components/install_agent_modal.vue +++ b/app/assets/javascripts/clusters_list/components/install_agent_modal.vue @@ -55,12 +55,12 @@ export default { return generateAgentRegistrationCommand(this.agentToken, this.kasAddress); }, basicInstallPath() { - return helpPagePath('user/clusters/agent/index', { + return helpPagePath('user/clusters/agent/install/index', { anchor: 'install-the-agent-into-the-cluster', }); }, advancedInstallPath() { - return helpPagePath('user/clusters/agent/index', { anchor: 'advanced-installation' }); + return helpPagePath('user/clusters/agent/install/index', { anchor: 'advanced-installation' }); }, }, methods: { diff --git a/app/assets/javascripts/feature_flags/components/configure_feature_flags_modal.vue b/app/assets/javascripts/feature_flags/components/configure_feature_flags_modal.vue index d86e13ce722..366ee6bb05b 100644 --- a/app/assets/javascripts/feature_flags/components/configure_feature_flags_modal.vue +++ b/app/assets/javascripts/feature_flags/components/configure_feature_flags_modal.vue @@ -213,6 +213,7 @@ export default { <div v-if="hasRotateError" class="gl-text-red-500 gl-display-flex gl-align-items-center gl-font-weight-normal gl-mb-3" + data-testid="rotate-error" > <gl-icon name="warning" class="gl-mr-2" /> <span>{{ $options.translations.instanceIdRegenerateError }}</span> |