diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-05 21:09:15 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-05 21:09:15 +0300 |
commit | 6d18e2830d07abf6f3318bd0e11a784bb67dbf52 (patch) | |
tree | bcef28df295708ef804447fed5ae5bdb0cca1db0 /app/assets/javascripts/members | |
parent | 2f229658aea96b45edbb28c97a2aa0c58b3433eb (diff) |
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/invite_action_buttons.vue | 1 | ||||
-rw-r--r-- | app/assets/javascripts/members/components/action_buttons/remove_member_button.vue | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/app/assets/javascripts/members/components/action_buttons/invite_action_buttons.vue b/app/assets/javascripts/members/components/action_buttons/invite_action_buttons.vue index 0bcc85157f1..91062c222f4 100644 --- a/app/assets/javascripts/members/components/action_buttons/invite_action_buttons.vue +++ b/app/assets/javascripts/members/components/action_buttons/invite_action_buttons.vue @@ -42,6 +42,7 @@ export default { :member-id="member.id" :message="message" :title="s__('Member|Revoke invite')" + is-invite /> </div> </action-button-group> 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 3777f1dbb97..9954da3e0d4 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 @@ -36,6 +36,11 @@ export default { required: false, default: false, }, + isInvite: { + type: Boolean, + required: false, + default: false, + }, }, computed: { ...mapState(['memberPath']), @@ -57,6 +62,7 @@ export default { :data-member-path="computedMemberPath" :data-member-type="memberType" :data-is-access-request="isAccessRequest" + :data-is-invite="isInvite" :data-message="message" data-qa-selector="delete_member_button" /> |