Commit af0a2866 authored by Sascha Eggenberger's avatar Sascha Eggenberger Committed by Peter Hegman

Rename remove user action

Fix inconsistent wording for removing member on project members
overview.
Renamed action "remove user" to "remove member".

Changelog: changed
parent ce215249
......@@ -25,7 +25,8 @@ export default {
},
title: {
type: String,
required: true,
required: false,
default: null,
},
icon: {
type: String,
......
......@@ -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">
......
......@@ -163,7 +163,7 @@ To remove a member from a project:
1. On the top bar, select **Menu > Projects** and find your project.
1. On the left sidebar, select **Project information > Members**.
1. Next to the project member you want to remove, select **Remove member** **{remove}**.
1. Next to the project member you want to remove, select **Remove member**.
1. Optional. In the confirmation box, select the
**Also unassign this user from related issues and merge requests** checkbox.
1. To prevent leaks of sensitive information from private projects, verify the
......
......@@ -22966,9 +22966,6 @@ msgstr ""
msgid "Member|Deny access"
msgstr ""
msgid "Member|Remove member"
msgstr ""
msgid "Member|Revoke invite"
msgstr ""
......
......@@ -43,12 +43,12 @@ describe('UserActionButtons', () => {
memberId: member.id,
memberType: 'GroupMember',
message: `Are you sure you want to remove ${member.user.name} from "${member.source.fullName}"?`,
title: 'Remove member',
title: null,
isAccessRequest: false,
isInvite: false,
icon: '',
buttonCategory: 'secondary',
buttonText: 'Remove user',
buttonText: 'Remove member',
userDeletionObstacles: {
name: member.user.name,
obstacles: parseUserDeletionObstacles(member.user),
......@@ -137,7 +137,7 @@ describe('UserActionButtons', () => {
it.each`
isInvitedUser | icon | buttonText | buttonCategory
${true} | ${'remove'} | ${null} | ${'primary'}
${false} | ${''} | ${'Remove user'} | ${'secondary'}
${false} | ${''} | ${'Remove member'} | ${'secondary'}
`(
'passes the correct props to remove-member-button when isInvitedUser is $isInvitedUser',
({ isInvitedUser, icon, buttonText, buttonCategory }) => {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment