Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc41

1 files changed, 6 insertions, 6 deletions

diff --git a/app/assets/javascripts/members/components/table/members_table.vue b/app/assets/javascripts/members/components/table/members_table.vue
index 16e0cd5ad4e..cfe9e40cde2 100644
--- a/app/assets/javascripts/members/components/table/members_table.vue
+++ b/app/assets/javascripts/members/components/table/members_table.vue
@@ -3,15 +3,15 @@ import { mapState } from 'vuex';
 import { GlTable, GlBadge } from '@gitlab/ui';
 import MembersTableCell from 'ee_else_ce/members/components/table/members_table_cell.vue';
 import { canOverride, canRemove, canResend, canUpdate } from 'ee_else_ce/members/utils';
-import { FIELDS } from '../../constants';
 import initUserPopovers from '~/user_popovers';
+import { FIELDS } from '../../constants';
+import RemoveGroupLinkModal from '../modals/remove_group_link_modal.vue';
 import MemberAvatar from './member_avatar.vue';
 import MemberSource from './member_source.vue';
 import CreatedAt from './created_at.vue';
 import ExpiresAt from './expires_at.vue';
 import MemberActionButtons from './member_action_buttons.vue';
 import RoleDropdown from './role_dropdown.vue';
-import RemoveGroupLinkModal from '../modals/remove_group_link_modal.vue';
 import ExpirationDatepicker from './expiration_datepicker.vue';
 
 export default {
@@ -32,7 +32,7 @@ export default {
       import('ee_component/members/components/ldap/ldap_override_confirmation_modal.vue'),
   },
   computed: {
-    ...mapState(['members', 'tableFields', 'tableAttrs', 'currentUserId', 'sourceId']),
+    ...mapState(['members', 'tableFields', 'tableAttrs', 'currentUserId']),
     filteredFields() {
       return FIELDS.filter(
         (field) => this.tableFields.includes(field.key) && this.showField(field),
@@ -55,9 +55,9 @@ export default {
   methods: {
     hasActionButtons(member) {
       return (
-        canRemove(member, this.sourceId) ||
+        canRemove(member) ||
         canResend(member) ||
-        canUpdate(member, this.currentUserId, this.sourceId) ||
+        canUpdate(member, this.currentUserId) ||
         canOverride(member)
       );
     },
@@ -80,7 +80,7 @@ export default {
         return 'col-actions';
       }
 
-      return ['col-actions', 'gl-display-none!', 'gl-display-lg-table-cell!'];
+      return ['col-actions', 'gl-display-none!', 'gl-lg-display-table-cell!'];
     },
     tbodyTrAttr(member) {
       return {