Merge branch 'credit-card-verification-alert-clarify-bringing-own-runners' into 'master'

Credit card verification alert clarify bringing own runners

See merge request gitlab-org/gitlab!61926

ee/app/assets/javascripts/billings/components/account_verification_modal.vue

@@ -12,8 +12,8 @@ const IFRAME_MINIMUM_HEIGHT = 350;
 const i18n = Object.freeze({
   title: s__('Billings|Validate user account'),
   description: s__(`
-Billings|To use free pipeline minutes, you'll need to validate your account with a credit card. This is required to discourage and reduce abuse on GitLab infrastructure.
-%{strongStart}GitLab will not charge or store your credit card, it will only be used for validation.%{strongEnd}`),
+Billings|To use free pipeline minutes on shared runners, you’ll need to validate your account with a credit or debit card. This is required to discourage and reduce abuse on GitLab infrastructure.
+%{strongStart}GitLab will not charge or store your card, it will only be used for validation.%{strongEnd}`),
   iframeNotSupported: __('Your browser does not support iFrames'),
   actions: {
     primary: {

ee/app/assets/javascripts/billings/components/cc_validation_required_alert.vue

 <script>
-import { GlAlert, GlSprintf } from '@gitlab/ui';
+import { GlAlert, GlSprintf, GlLink } from '@gitlab/ui';
 import { s__ } from '~/locale';
 import AccountVerificationModal from './account_verification_modal.vue';
 
@@ -12,11 +12,12 @@ const i18n = {
   },
   dangerAlert: {
     title: s__('Billings|User validation required'),
-    text: s__(`Billings|To use free pipeline minutes, you'll need to validate your account with a credit card.
+    text: s__(`Billings|To use free pipeline minutes on shared runners, you’ll need to validate your account with a credit or debit card. If you prefer not to provide one, you can run pipelines by bringing your own runners and disabling shared runners for your project.
     This is required to discourage and reduce abuse on GitLab infrastructure.
-%{strongStart}GitLab will not charge or store your credit card, it will only be used for validation.%{strongEnd}`),
+    %{strongStart}GitLab will not charge or store your card, it will only be used for validation.%{strongEnd} %{linkStart}Learn more%{linkEnd}.`),
     primaryButtonText: s__('Billings|Validate account'),
   },
+  pipelineVerificationLink: 'https://about.gitlab.com/blog/2021/05/17/prevent-crypto-mining-abuse/',
 };
 
 export default {
@@ -24,6 +25,7 @@ export default {
   components: {
     GlAlert,
     GlSprintf,
+    GlLink,
     AccountVerificationModal,
   },
   data() {
@@ -74,6 +76,9 @@ export default {
         <template #strong="{ content }">
           <strong>{{ content }}</strong>
         </template>
+        <template #link="{ content }">
+          <gl-link :href="$options.i18n.pipelineVerificationLink">{{ content }}</gl-link>
+        </template>
       </gl-sprintf>
     </gl-alert>
 

locale/gitlab.pot

@@ -5099,7 +5099,10 @@ msgstr ""
 msgid "BillingPlan|Upgrade for free"
 msgstr ""
 
-msgid "Billings|To use free pipeline minutes, you'll need to validate your account with a credit card. This is required to discourage and reduce abuse on GitLab infrastructure. %{strongStart}GitLab will not charge or store your credit card, it will only be used for validation.%{strongEnd}"
+msgid "Billings|To use free pipeline minutes on shared runners, you’ll need to validate your account with a credit or debit card. If you prefer not to provide one, you can run pipelines by bringing your own runners and disabling shared runners for your project. This is required to discourage and reduce abuse on GitLab infrastructure. %{strongStart}GitLab will not charge or store your card, it will only be used for validation.%{strongEnd} %{linkStart}Learn more%{linkEnd}."
+msgstr ""
+
+msgid "Billings|To use free pipeline minutes on shared runners, you’ll need to validate your account with a credit or debit card. This is required to discourage and reduce abuse on GitLab infrastructure. %{strongStart}GitLab will not charge or store your card, it will only be used for validation.%{strongEnd}"
 msgstr ""
 
 msgid "Billings|User successfully validated"