diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-24 03:06:02 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-24 03:06:02 +0300 |
commit | 83ad9ec8cc449dca0b57a34a10afd529326c1d57 (patch) | |
tree | b085aacd0682bb2e6073c45b4a6a7ef8b48b7069 /app/assets/javascripts/clusters | |
parent | b9254657872c4db441ab268154686f5476fb4bc6 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/clusters')
-rw-r--r-- | app/assets/javascripts/clusters/components/uninstall_application_confirmation_modal.vue | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/app/assets/javascripts/clusters/components/uninstall_application_confirmation_modal.vue b/app/assets/javascripts/clusters/components/uninstall_application_confirmation_modal.vue index 4f60e543666..f1925c243f2 100644 --- a/app/assets/javascripts/clusters/components/uninstall_application_confirmation_modal.vue +++ b/app/assets/javascripts/clusters/components/uninstall_application_confirmation_modal.vue @@ -5,8 +5,14 @@ import trackUninstallButtonClickMixin from 'ee_else_ce/clusters/mixins/track_uni import { HELM, INGRESS, CERT_MANAGER, PROMETHEUS, RUNNER, KNATIVE, JUPYTER } from '../constants'; const CUSTOM_APP_WARNING_TEXT = { - [HELM]: s__( - 'ClusterIntegration|The associated Tiller pod will be deleted and cannot be restored.', + [HELM]: sprintf( + s__( + 'ClusterIntegration|The associated Tiller pod, the %{gitlabManagedAppsNamespace} namespace, and all of its resources will be deleted and cannot be restored.', + ), + { + gitlabManagedAppsNamespace: '<code>gitlab-managed-apps</code>', + }, + false, ), [INGRESS]: s__( 'ClusterIntegration|The associated load balancer and IP will be deleted and cannot be restored.', @@ -76,6 +82,7 @@ export default { :modal-id="modalId" :title="title" @ok="confirmUninstall()" - >{{ warningText }} {{ customAppWarningText }}</gl-modal > + {{ warningText }} <span v-html="customAppWarningText"></span> + </gl-modal> </template> |