From b76ae638462ab0f673e5915986070518dd3f9ad3 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Thu, 19 Aug 2021 09:08:42 +0000
Subject: Add latest changes from gitlab-org/gitlab@14-2-stable-ee

---
 app/assets/javascripts/admin/users/components/actions/ban.vue      | 7 ++++---
 app/assets/javascripts/admin/users/components/actions/delete.vue   | 1 +
 .../admin/users/components/actions/delete_with_contributions.vue   | 1 +
 .../admin/users/components/actions/shared/shared_delete_action.vue | 6 +++++-
 4 files changed, 11 insertions(+), 4 deletions(-)

(limited to 'app/assets/javascripts/admin')

diff --git a/app/assets/javascripts/admin/users/components/actions/ban.vue b/app/assets/javascripts/admin/users/components/actions/ban.vue
index 4e9cefbfdd7..e5ab0f9123f 100644
--- a/app/assets/javascripts/admin/users/components/actions/ban.vue
+++ b/app/assets/javascripts/admin/users/components/actions/ban.vue
@@ -6,10 +6,11 @@ import { I18N_USER_ACTIONS } from '../../constants';
 
 // TODO: To be replaced with <template> content in https://gitlab.com/gitlab-org/gitlab/-/issues/320922
 const messageHtml = `
-  <p>${s__('AdminUsers|When banned, users:')}</p>
+  <p>${s__('AdminUsers|When banned:')}</p>
   <ul>
-    <li>${s__("AdminUsers|Can't log in.")}</li>
-    <li>${s__("AdminUsers|Can't access Git repositories.")}</li>
+    <li>${s__("AdminUsers|The user can't log in.")}</li>
+    <li>${s__("AdminUsers|The user can't access git repositories.")}</li>
+    <li>${s__('AdminUsers|Issues authored by this user are hidden from other users.')}</li>
   </ul>
   <p>${s__('AdminUsers|You can unban their account in the future. Their data remains intact.')}</p>
   <p>${sprintf(
diff --git a/app/assets/javascripts/admin/users/components/actions/delete.vue b/app/assets/javascripts/admin/users/components/actions/delete.vue
index 6f4f272154a..a0f4a4bf382 100644
--- a/app/assets/javascripts/admin/users/components/actions/delete.vue
+++ b/app/assets/javascripts/admin/users/components/actions/delete.vue
@@ -28,6 +28,7 @@ export default {
     modal-type="delete"
     :username="username"
     :paths="paths"
+    :delete-path="paths.delete"
     :oncall-schedules="oncallSchedules"
   >
     <slot></slot>
diff --git a/app/assets/javascripts/admin/users/components/actions/delete_with_contributions.vue b/app/assets/javascripts/admin/users/components/actions/delete_with_contributions.vue
index 82b09c04ab2..02fd3efafa1 100644
--- a/app/assets/javascripts/admin/users/components/actions/delete_with_contributions.vue
+++ b/app/assets/javascripts/admin/users/components/actions/delete_with_contributions.vue
@@ -28,6 +28,7 @@ export default {
     modal-type="delete-with-contributions"
     :username="username"
     :paths="paths"
+    :delete-path="paths.deleteWithContributions"
     :oncall-schedules="oncallSchedules"
   >
     <slot></slot>
diff --git a/app/assets/javascripts/admin/users/components/actions/shared/shared_delete_action.vue b/app/assets/javascripts/admin/users/components/actions/shared/shared_delete_action.vue
index b3b68442e80..a1589c9d46d 100644
--- a/app/assets/javascripts/admin/users/components/actions/shared/shared_delete_action.vue
+++ b/app/assets/javascripts/admin/users/components/actions/shared/shared_delete_action.vue
@@ -14,6 +14,10 @@ export default {
       type: Object,
       required: true,
     },
+    deletePath: {
+      type: String,
+      required: true,
+    },
     modalType: {
       type: String,
       required: true,
@@ -27,7 +31,7 @@ export default {
     modalAttributes() {
       return {
         'data-block-user-url': this.paths.block,
-        'data-delete-user-url': this.paths.delete,
+        'data-delete-user-url': this.deletePath,
         'data-gl-modal-action': this.modalType,
         'data-username': this.username,
         'data-oncall-schedules': JSON.stringify(this.oncallSchedules),
-- 
cgit v1.2.3