Commit 666264ae authored by Nicolò Maria Mezzopera's avatar Nicolò Maria Mezzopera

Merge branch 'vs/remove-redundant-learn-more-link' into 'master'

Remove redundant Learn More link

See merge request gitlab-org/gitlab!61401
parents 75848166 d3d648b9
<script> <script>
import { GlAlert, GlLink, GlSprintf } from '@gitlab/ui'; import { GlAlert, GlSprintf } from '@gitlab/ui';
import { s__ } from '~/locale'; import { s__ } from '~/locale';
import AccountVerificationModal from './account_verification_modal.vue'; import AccountVerificationModal from './account_verification_modal.vue';
...@@ -7,7 +7,7 @@ const i18n = { ...@@ -7,7 +7,7 @@ const i18n = {
alertTitle: s__('Billings|User Verification Required'), alertTitle: s__('Billings|User Verification Required'),
alertText: s__(`Billings|As a user on a free or trial namespace, you'll need to verify your account with a credit card to run pipelines. This is required to help prevent alertText: s__(`Billings|As a user on a free or trial namespace, you'll need to verify your account with a credit card to run pipelines. This is required to help prevent
cryptomining attacks on GitLab infrastructure. cryptomining attacks on GitLab infrastructure.
%{strongStart}GitLab will not charge or store your credit card, it will only be used for validation.%{strongEnd} %{linkStart}Learn more%{linkEnd}.`), %{strongStart}GitLab will not charge or store your credit card, it will only be used for validation.%{strongEnd}`),
primaryButtonText: s__('Billings|Verify account'), primaryButtonText: s__('Billings|Verify account'),
}; };
...@@ -15,7 +15,6 @@ export default { ...@@ -15,7 +15,6 @@ export default {
name: 'CreditCardValidationRequiredAlert', name: 'CreditCardValidationRequiredAlert',
components: { components: {
GlAlert, GlAlert,
GlLink,
GlSprintf, GlSprintf,
AccountVerificationModal, AccountVerificationModal,
}, },
...@@ -29,11 +28,6 @@ export default { ...@@ -29,11 +28,6 @@ export default {
required: true, required: true,
}, },
}, },
computed: {
learnMoreUrl() {
return 'about:blank';
},
},
methods: { methods: {
showModal() { showModal() {
this.$refs.modal.show(); this.$refs.modal.show();
...@@ -56,9 +50,6 @@ export default { ...@@ -56,9 +50,6 @@ export default {
<template #strong="{ content }"> <template #strong="{ content }">
<strong>{{ content }}</strong> <strong>{{ content }}</strong>
</template> </template>
<template #link="{ content }">
<gl-link :href="learnMoreUrl">{{ content }}</gl-link>
</template>
</gl-sprintf> </gl-sprintf>
</gl-alert> </gl-alert>
......
...@@ -5043,7 +5043,7 @@ msgstr "" ...@@ -5043,7 +5043,7 @@ msgstr ""
msgid "BillingPlan|Upgrade for free" msgid "BillingPlan|Upgrade for free"
msgstr "" msgstr ""
msgid "Billings|As a user on a free or trial namespace, you'll need to verify your account with a credit card to run pipelines. This is required to help prevent cryptomining attacks on GitLab infrastructure. %{strongStart}GitLab will not charge or store your credit card, it will only be used for validation.%{strongEnd} %{linkStart}Learn more%{linkEnd}." msgid "Billings|As a user on a free or trial namespace, you'll need to verify your account with a credit card to run pipelines. This is required to help prevent cryptomining attacks on GitLab infrastructure. %{strongStart}GitLab will not charge or store your credit card, it will only be used for validation.%{strongEnd}"
msgstr "" msgstr ""
msgid "Billings|User Verification Required" msgid "Billings|User Verification Required"
......
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