Add latest changes from gitlab-org/gitlab@master

2 files changed, 13 insertions, 1 deletions

diff --git a/app/assets/javascripts/members/components/action_dropdowns/constants.js b/app/assets/javascripts/members/components/action_dropdowns/constants.js
index 8ccfc57dc28..ce6865a8f0a 100644
--- a/app/assets/javascripts/members/components/action_dropdowns/constants.js
+++ b/app/assets/javascripts/members/components/action_dropdowns/constants.js
@@ -19,4 +19,5 @@ export const I18N = {
   lastGroupOwnerCannotBeRemoved: s__(
     'Members|A group must have at least one owner. To remove the member, assign a new owner.',
   ),
+  banMember: s__('Members|Ban member'),
 };
diff --git a/app/assets/javascripts/members/components/action_dropdowns/user_action_dropdown.vue b/app/assets/javascripts/members/components/action_dropdowns/user_action_dropdown.vue
index 82f5c5457ec..c82ebadea6e 100644
--- a/app/assets/javascripts/members/components/action_dropdowns/user_action_dropdown.vue
+++ b/app/assets/javascripts/members/components/action_dropdowns/user_action_dropdown.vue
@@ -23,6 +23,8 @@ export default {
       import('ee_component/members/components/action_dropdowns/ldap_override_dropdown_item.vue'),
     LeaveGroupDropdownItem,
     RemoveMemberDropdownItem,
+    BanMemberDropdownItem: () =>
+      import('ee_component/members/components/action_dropdowns/ban_member_dropdown_item.vue'),
   },
   directives: {
     GlTooltip: GlTooltipDirective,
@@ -77,7 +79,10 @@ export default {
     },
     showDropdown() {
       return (
-        this.permissions.canDisableTwoFactor || this.showLeaveOrRemove || this.showLdapOverride
+        this.permissions.canDisableTwoFactor ||
+        this.showLeaveOrRemove ||
+        this.showLdapOverride ||
+        this.showBan
       );
     },
     showLeaveOrRemove() {
@@ -86,6 +91,9 @@ export default {
     showLdapOverride() {
       return this.permissions.canOverride && !this.member.isOverridden;
     },
+    showBan() {
+      return !this.isCurrentUser && this.permissions.canBan;
+    },
   },
 };
 </script>
@@ -130,5 +138,8 @@ export default {
     <ldap-override-dropdown-item v-else-if="showLdapOverride" :member="member">{{
       $options.i18n.editPermissions
     }}</ldap-override-dropdown-item>
+    <ban-member-dropdown-item v-if="showBan" :member="member">{{
+      $options.i18n.banMember
+    }}</ban-member-dropdown-item>
   </gl-dropdown>
 </template>