diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-10 06:08:56 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-10 06:08:56 +0300 |
commit | 981fb44c366ced582da203cf6970ee225466036b (patch) | |
tree | 9561f23bca3789e6d8bdf0151864ca5555753653 /app/assets/javascripts/admin | |
parent | 237ead18b945830ed60ac1b4382a4431d66818a6 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/admin')
-rw-r--r-- | app/assets/javascripts/admin/users/components/user_actions.vue | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/app/assets/javascripts/admin/users/components/user_actions.vue b/app/assets/javascripts/admin/users/components/user_actions.vue index f5d21ece138..829174d7593 100644 --- a/app/assets/javascripts/admin/users/components/user_actions.vue +++ b/app/assets/javascripts/admin/users/components/user_actions.vue @@ -69,7 +69,6 @@ export default { editButtonAttrs() { return { 'data-testid': 'edit', - icon: 'pencil-square', href: this.userPaths.edit, }; }, @@ -101,6 +100,7 @@ export default { <gl-button v-else v-gl-tooltip="$options.i18n.edit" + icon="pencil-square" v-bind="editButtonAttrs" :aria-label="$options.i18n.edit" /> @@ -108,10 +108,9 @@ export default { <div v-if="hasDropdownActions" class="gl-p-2"> <gl-dropdown + v-gl-tooltip="$options.i18n.userAdministration" data-testid="dropdown-toggle" - :text="$options.i18n.userAdministration" - :text-sr-only="!showButtonLabels" - icon="ellipsis_h" + icon="ellipsis_v" data-qa-selector="user_actions_dropdown_toggle" :data-qa-username="user.username" no-caret |