diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-12 00:07:59 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-12 00:07:59 +0300 |
| commit | e09df167d9b060d9c194a49f3ae9f7ac72632413 (patch) | |
| tree | 83a8ce826d315a0e3ace3f85b9bf66d5d852615c /app/assets/javascripts/members | |
| parent | c511df8a7e79a3df0b03eb774be53651a1aa465d (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/remove_member_button.vue | 3 | ||||
| -rw-r--r-- | app/assets/javascripts/members/components/action_buttons/user_action_buttons.vue | 3 |
2 files changed, 3 insertions, 3 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 01606d07554..27c67e84675 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 @@ -25,7 +25,8 @@ export default { }, title: { type: String, - required: true, + required: false, + default: null, }, icon: { type: String, 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 594da7f68cc..122e0a142a9 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 @@ -61,7 +61,7 @@ export default { }; }, removeMemberButtonText() { - return this.isInvitedUser ? null : __('Remove user'); + return this.isInvitedUser ? null : __('Remove member'); }, removeMemberButtonIcon() { return this.isInvitedUser ? 'remove' : ''; @@ -86,7 +86,6 @@ export default { :icon="removeMemberButtonIcon" :button-text="removeMemberButtonText" :button-category="removeMemberButtonCategory" - :title="s__('Member|Remove member')" /> </div> <div v-else-if="permissions.canOverride && !member.isOverridden" class="gl-px-1"> |