Add latest changes from gitlab-org/gitlab@master

2 files changed, 37 insertions, 5 deletions

diff --git a/app/assets/javascripts/admin/abuse_report/components/user_details.vue b/app/assets/javascripts/admin/abuse_report/components/user_details.vue
index 0c32341652b..0e946fed8ac 100644
--- a/app/assets/javascripts/admin/abuse_report/components/user_details.vue
+++ b/app/assets/javascripts/admin/abuse_report/components/user_details.vue
@@ -26,12 +26,18 @@ export default {
         .map(([k]) => this.$options.i18n.verificationMethods[k])
         .join(', ');
     },
-    showSimilarRecords() {
+    showCreditCardSimilarRecords() {
       return this.user.creditCard.similarRecordsCount > 1;
     },
-    similarRecordsCount() {
+    creditCardSimilarRecordsCount() {
       return formatNumber(this.user.creditCard.similarRecordsCount);
     },
+    showPhoneNumberSimilarRecords() {
+      return this.user.phoneNumber.similarRecordsCount > 1;
+    },
+    phoneNumberSimilarRecordsCount() {
+      return formatNumber(this.user.phoneNumber.similarRecordsCount);
+    },
   },
   i18n: USER_DETAILS_I18N,
 };
@@ -60,11 +66,33 @@ export default {
       data-testid="credit-card-verification"
       :label="$options.i18n.creditCard"
     >
-      <gl-sprintf v-if="showSimilarRecords" :message="$options.i18n.similarRecords">
+      <gl-sprintf
+        v-if="showCreditCardSimilarRecords"
+        :message="$options.i18n.creditCardSimilarRecords"
+      >
         <template #cardMatchesLink="{ content }">
           <gl-link :href="user.creditCard.cardMatchesLink">
             <gl-sprintf :message="content">
-              <template #count>{{ similarRecordsCount }}</template>
+              <template #count>{{ creditCardSimilarRecordsCount }}</template>
+            </gl-sprintf>
+          </gl-link>
+        </template>
+      </gl-sprintf>
+    </user-detail>
+
+    <user-detail
+      v-if="user.phoneNumber"
+      data-testid="phone-number-verification"
+      :label="$options.i18n.phoneNumber"
+    >
+      <gl-sprintf
+        v-if="showPhoneNumberSimilarRecords"
+        :message="$options.i18n.phoneNumberSimilarRecords"
+      >
+        <template #phoneMatchesLink="{ content }">
+          <gl-link :href="user.phoneNumber.phoneMatchesLink">
+            <gl-sprintf :message="content">
+              <template #count>{{ phoneNumberSimilarRecordsCount }}</template>
             </gl-sprintf>
           </gl-link>
         </template>
diff --git a/app/assets/javascripts/admin/abuse_report/constants.js b/app/assets/javascripts/admin/abuse_report/constants.js
index c56ea678b1d..69bcdebad61 100644
--- a/app/assets/javascripts/admin/abuse_report/constants.js
+++ b/app/assets/javascripts/admin/abuse_report/constants.js
@@ -61,6 +61,7 @@ export const USER_DETAILS_I18N = {
   plan: s__('AbuseReport|Tier'),
   verification: s__('AbuseReport|Verification'),
   creditCard: s__('AbuseReport|Credit card'),
+  phoneNumber: s__('AbuseReport|Phone number'),
   pastReports: s__('AbuseReport|Past abuse reports'),
   normalLocation: s__('AbuseReport|Normal location'),
   lastSignInIp: s__('AbuseReport|Last login'),
@@ -78,9 +79,12 @@ export const USER_DETAILS_I18N = {
   reportedFor: s__(
     'AbuseReport|%{reportLinkStart}Reported%{reportLinkEnd} for %{category} %{timeAgo}.',
   ),
-  similarRecords: s__(
+  creditCardSimilarRecords: s__(
     'AbuseReport|Card matches %{cardMatchesLinkStart}%{count} accounts%{cardMatchesLinkEnd}',
   ),
+  phoneNumberSimilarRecords: s__(
+    'AbuseReport|Phone matches %{phoneMatchesLinkStart}%{count} accounts%{phoneMatchesLinkEnd}',
+  ),
 };
 
 export const REPORTED_CONTENT_I18N = {