diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-23 12:09:33 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-23 12:09:33 +0000 |
commit | b38fc20ae0e90d5b1c538a139aa0a7da1b7b5726 (patch) | |
tree | 3ce77cdb707b75c9d74c6ff2a8386dd06bd48b44 /app/assets/javascripts/members | |
parent | b3647b2a67930e8aa3c1b1dd9bda29c368c862ba (diff) | |
download | gitlab-ce-b38fc20ae0e90d5b1c538a139aa0a7da1b7b5726.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/members')
-rw-r--r-- | app/assets/javascripts/members/components/action_buttons/remove_member_button.vue | 6 | ||||
-rw-r--r-- | app/assets/javascripts/members/components/action_buttons/user_action_buttons.vue | 1 |
2 files changed, 7 insertions, 0 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 cb71be39ebc..3777f1dbb97 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 @@ -13,6 +13,11 @@ export default { type: Number, required: true, }, + memberType: { + type: String, + required: false, + default: null, + }, message: { type: String, required: true, @@ -50,6 +55,7 @@ export default { :aria-label="title" :icon="icon" :data-member-path="computedMemberPath" + :data-member-type="memberType" :data-is-access-request="isAccessRequest" :data-message="message" data-qa-selector="delete_member_button" diff --git a/app/assets/javascripts/members/components/action_buttons/user_action_buttons.vue b/app/assets/javascripts/members/components/action_buttons/user_action_buttons.vue index f779d1755a5..e723685d88b 100644 --- a/app/assets/javascripts/members/components/action_buttons/user_action_buttons.vue +++ b/app/assets/javascripts/members/components/action_buttons/user_action_buttons.vue @@ -59,6 +59,7 @@ export default { <remove-member-button v-else :member-id="member.id" + :member-type="member.type" :message="message" :title="s__('Member|Remove member')" /> |