Add latest changes from gitlab-org/gitlab@master

2 files changed, 4 insertions, 4 deletions

diff --git a/app/assets/javascripts/members/components/table/member_action_buttons.vue b/app/assets/javascripts/members/components/table/member_actions.vue
index 6ec7be608ba..61a6f37687a 100644
--- a/app/assets/javascripts/members/components/table/member_action_buttons.vue
+++ b/app/assets/javascripts/members/components/table/member_actions.vue
@@ -6,7 +6,7 @@ import InviteActionButtons from '../action_buttons/invite_action_buttons.vue';
 import UserActionDropdown from '../action_dropdowns/user_action_dropdown.vue';
 
 export default {
-  name: 'MemberActionButtons',
+  name: 'MemberActions',
   components: {
     UserActionDropdown,
     GroupActionButtons,
diff --git a/app/assets/javascripts/members/components/table/members_table.vue b/app/assets/javascripts/members/components/table/members_table.vue
index 8f03a298e63..22cbca2c143 100644
--- a/app/assets/javascripts/members/components/table/members_table.vue
+++ b/app/assets/javascripts/members/components/table/members_table.vue
@@ -26,7 +26,7 @@ import RemoveGroupLinkModal from '../modals/remove_group_link_modal.vue';
 import RemoveMemberModal from '../modals/remove_member_modal.vue';
 import CreatedAt from './created_at.vue';
 import ExpirationDatepicker from './expiration_datepicker.vue';
-import MemberActionButtons from './member_action_buttons.vue';
+import MemberActions from './member_actions.vue';
 import MemberAvatar from './member_avatar.vue';
 import MemberSource from './member_source.vue';
 import MemberActivity from './member_activity.vue';
@@ -42,7 +42,7 @@ export default {
     CreatedAt,
     MembersTableCell,
     MemberSource,
-    MemberActionButtons,
+    MemberActions,
     RoleDropdown,
     RemoveGroupLinkModal,
     RemoveMemberModal,
@@ -299,7 +299,7 @@ export default {
 
       <template #cell(actions)="{ item: member }">
         <members-table-cell #default="{ memberType, isCurrentUser, permissions }" :member="member">
-          <member-action-buttons
+          <member-actions
             :member-type="memberType"
             :is-current-user="isCurrentUser"
             :permissions="permissions"