Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
f46ec577
Commit
f46ec577
authored
Feb 27, 2022
by
Austin Regnery
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update icon, remove text, and switch
Changelog: changed
parent
df12ad25
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
app/assets/javascripts/admin/users/components/user_actions.vue
...ssets/javascripts/admin/users/components/user_actions.vue
+3
-3
app/views/admin/users/_head.html.haml
app/views/admin/users/_head.html.haml
+2
-2
No files found.
app/assets/javascripts/admin/users/components/user_actions.vue
View file @
f46ec577
...
...
@@ -69,7 +69,6 @@ export default {
editButtonAttrs
()
{
return
{
'
data-testid
'
:
'
edit
'
,
icon
:
'
pencil-square
'
,
href
:
this
.
userPaths
.
edit
,
};
},
...
...
@@ -100,6 +99,7 @@ export default {
}}
</gl-button>
<gl-button
v-else
icon=
"pencil-square"
v-gl-tooltip=
"$options.i18n.edit"
v-bind=
"editButtonAttrs"
:aria-label=
"$options.i18n.edit"
...
...
@@ -109,11 +109,11 @@ export default {
<div
v-if=
"hasDropdownActions"
class=
"gl-p-2"
>
<gl-dropdown
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"
v-gl-tooltip=
"$options.i18n.userAdministration"
no-caret
right
>
...
...
app/views/admin/users/_head.html.haml
View file @
f46ec577
...
...
@@ -27,8 +27,6 @@
=
render_if_exists
'admin/users/gma_user_badge'
.gl-my-3.gl-display-flex.gl-flex-wrap.gl-my-n2.gl-mx-n2
.gl-p-2
#js-admin-user-actions
{
data:
admin_user_actions_data_attributes
(
@user
)
}
-
if
@user
!=
current_user
.gl-p-2
-
if
impersonation_enabled?
&&
@user
.
can?
(
:log_in
)
...
...
@@ -36,6 +34,8 @@
-
if
can_force_email_confirmation?
(
@user
)
%button
.btn.gl-button.btn-info.js-confirm-modal-button
{
data:
confirm_user_data
(
@user
)
}
=
_
(
'Confirm user'
)
.gl-p-2
#js-admin-user-actions
{
data:
admin_user_actions_data_attributes
(
@user
)
}
=
gl_tabs_nav
do
=
gl_tab_link_to
_
(
"Account"
),
admin_user_path
(
@user
)
=
gl_tab_link_to
_
(
"Groups and projects"
),
projects_admin_user_path
(
@user
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment