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
894e9c7f
Commit
894e9c7f
authored
Aug 19, 2018
by
Eva Kadlecová
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Expose user's id in /admin/users/ show page.
parent
120ce02e
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
0 deletions
+10
-0
app/views/admin/users/show.html.haml
app/views/admin/users/show.html.haml
+4
-0
changelogs/unreleased/expose-users-id-in-admin-users-show-page.yml
...s/unreleased/expose-users-id-in-admin-users-show-page.yml
+5
-0
spec/features/admin/admin_users_spec.rb
spec/features/admin/admin_users_spec.rb
+1
-0
No files found.
app/views/admin/users/show.html.haml
View file @
894e9c7f
...
@@ -39,6 +39,10 @@
...
@@ -39,6 +39,10 @@
%strong
=
email
.
email
%strong
=
email
.
email
=
link_to
remove_email_admin_user_path
(
@user
,
email
),
data:
{
confirm:
"Are you sure you want to remove
#{
email
.
email
}
?"
},
method: :delete
,
class:
"btn-sm btn btn-remove float-right"
,
title:
'Remove secondary email'
,
id:
"remove_email_
#{
email
.
id
}
"
do
=
link_to
remove_email_admin_user_path
(
@user
,
email
),
data:
{
confirm:
"Are you sure you want to remove
#{
email
.
email
}
?"
},
method: :delete
,
class:
"btn-sm btn btn-remove float-right"
,
title:
'Remove secondary email'
,
id:
"remove_email_
#{
email
.
id
}
"
do
%i
.fa.fa-times
%i
.fa.fa-times
%li
%span
.light
ID:
%strong
=
@user
.
id
%li
.two-factor-status
%li
.two-factor-status
%span
.light
Two-factor Authentication:
%span
.light
Two-factor Authentication:
...
...
changelogs/unreleased/expose-users-id-in-admin-users-show-page.yml
0 → 100644
View file @
894e9c7f
---
title
:
Expose user's id in /admin/users/ show page
merge_request
:
author
:
Eva Kadlecova
type
:
changed
spec/features/admin/admin_users_spec.rb
View file @
894e9c7f
...
@@ -134,6 +134,7 @@ describe "Admin::Users" do
...
@@ -134,6 +134,7 @@ describe "Admin::Users" do
expect
(
page
).
to
have_content
(
user
.
email
)
expect
(
page
).
to
have_content
(
user
.
email
)
expect
(
page
).
to
have_content
(
user
.
name
)
expect
(
page
).
to
have_content
(
user
.
name
)
expect
(
page
).
to
have_content
(
user
.
id
)
expect
(
page
).
to
have_link
(
'Block user'
,
href:
block_admin_user_path
(
user
))
expect
(
page
).
to
have_link
(
'Block user'
,
href:
block_admin_user_path
(
user
))
expect
(
page
).
to
have_button
(
'Delete user'
)
expect
(
page
).
to
have_button
(
'Delete user'
)
expect
(
page
).
to
have_button
(
'Delete user and contributions'
)
expect
(
page
).
to
have_button
(
'Delete user and contributions'
)
...
...
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