Add latest changes from gitlab-org/gitlab@master

5 files changed, 23 insertions, 12 deletions

diff --git a/app/assets/javascripts/members/components/action_buttons/remove_member_button.vue b/app/assets/javascripts/members/components/action_buttons/remove_member_button.vue
index e7d813279a2..4b3bb89da55 100644
--- a/app/assets/javascripts/members/components/action_buttons/remove_member_button.vue
+++ b/app/assets/javascripts/members/components/action_buttons/remove_member_button.vue
@@ -14,11 +14,6 @@ export default {
       type: Number,
       required: true,
     },
-    memberType: {
-      type: String,
-      required: false,
-      default: null,
-    },
     message: {
       type: String,
       required: true,
@@ -54,7 +49,6 @@ export default {
         isAccessRequest: this.isAccessRequest,
         isInvite: this.isInvite,
         memberPath: this.memberPath.replace(':id', this.memberId),
-        memberType: this.memberType,
         message: this.message,
         userDeletionObstacles: this.userDeletionObstacles,
       };
diff --git a/app/assets/javascripts/members/components/action_dropdowns/remove_member_dropdown_item.vue b/app/assets/javascripts/members/components/action_dropdowns/remove_member_dropdown_item.vue
index cf1ba467772..18f1a8739bf 100644
--- a/app/assets/javascripts/members/components/action_dropdowns/remove_member_dropdown_item.vue
+++ b/app/assets/javascripts/members/components/action_dropdowns/remove_member_dropdown_item.vue
@@ -11,7 +11,12 @@ export default {
       type: Number,
       required: true,
     },
-    memberType: {
+    /**
+     * `GroupMember` (`app/models/members/group_member.rb`)
+     * or
+     * `ProjectMember` (`app/models/members/project_member.rb`).
+     */
+    memberModelType: {
       type: String,
       required: false,
       default: null,
@@ -47,7 +52,7 @@ export default {
         isAccessRequest: this.isAccessRequest,
         isInvite: this.isInvite,
         memberPath: this.memberPath.replace(':id', this.memberId),
-        memberType: this.memberType,
+        memberModelType: this.memberModelType,
         message: this.modalMessage,
         userDeletionObstacles: this.userDeletionObstacles,
       };
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 1d77657d32b..4e5e6b0cab4 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
@@ -83,7 +83,7 @@ export default {
       <remove-member-dropdown-item
         v-else
         :member-id="member.id"
-        :member-type="member.type"
+        :member-model-type="member.type"
         :user-deletion-obstacles="userDeletionObstaclesUserData"
         :modal-message="modalMessage"
         >{{ $options.i18n.removeMember }}</remove-member-dropdown-item
diff --git a/app/assets/javascripts/members/components/modals/remove_member_modal.vue b/app/assets/javascripts/members/components/modals/remove_member_modal.vue
index 1bb1f90302c..edd464574fb 100644
--- a/app/assets/javascripts/members/components/modals/remove_member_modal.vue
+++ b/app/assets/javascripts/members/components/modals/remove_member_modal.vue
@@ -4,6 +4,7 @@ import { mapActions, mapState } from 'vuex';
 import csrf from '~/lib/utils/csrf';
 import { s__, __ } from '~/locale';
 import UserDeletionObstaclesList from '~/vue_shared/components/user_deletion_obstacles/user_deletion_obstacles_list.vue';
+import { MEMBER_MODEL_TYPE_GROUP_MEMBER } from '../../constants';
 
 export default {
   actionCancel: {
@@ -27,8 +28,13 @@ export default {
       memberPath(state) {
         return state[this.namespace].removeMemberModalData.memberPath;
       },
-      memberType(state) {
-        return state[this.namespace].removeMemberModalData.memberType;
+      /**
+       * `GroupMember` (`app/models/members/group_member.rb`)
+       * or
+       * `ProjectMember` (`app/models/members/project_member.rb`).
+       */
+      memberModelType(state) {
+        return state[this.namespace].removeMemberModalData.memberModelType;
       },
       message(state) {
         return state[this.namespace].removeMemberModalData.message;
@@ -41,7 +47,7 @@ export default {
       },
     }),
     isGroupMember() {
-      return this.memberType === 'GroupMember';
+      return this.memberModelType === MEMBER_MODEL_TYPE_GROUP_MEMBER;
     },
     actionText() {
       if (this.isAccessRequest) {
diff --git a/app/assets/javascripts/members/constants.js b/app/assets/javascripts/members/constants.js
index 5560348b803..68c5831db62 100644
--- a/app/assets/javascripts/members/constants.js
+++ b/app/assets/javascripts/members/constants.js
@@ -163,6 +163,12 @@ export const MEMBER_TYPES = {
   accessRequest: 'accessRequest',
 };
 
+// `app/models/members/group_member.rb`
+export const MEMBER_MODEL_TYPE_GROUP_MEMBER = 'GroupMember';
+
+// `app/models/members/project_member.rb`
+export const MEMBER_MODEL_TYPE_PROJECT_MEMBER = 'ProjectMember';
+
 export const TAB_QUERY_PARAM_VALUES = {
   group: 'groups',
   invite: 'invited',