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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
a3bbfbae
Commit
a3bbfbae
authored
Apr 02, 2019
by
Dennis Tang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
CE port: Move EE differences for `app/views/admin/users/show.html.haml`
parent
f15caf01
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
1 deletion
+8
-1
app/views/admin/users/_user_detail.html.haml
app/views/admin/users/_user_detail.html.haml
+1
-1
app/views/admin/users/show.html.haml
app/views/admin/users/show.html.haml
+7
-0
No files found.
app/views/admin/users/_user_detail.html.haml
View file @
a3bbfbae
...
...
@@ -6,7 +6,7 @@
=
image_tag
avatar_icon_for_user
(
user
),
class:
'avatar s16 d-xs-flex d-md-none mr-1 prepend-top-2'
,
alt:
_
(
'Avatar for %{name}'
)
%
{
name:
sanitize_name
(
user
.
name
)
}
=
link_to
user
.
name
,
admin_user_path
(
user
),
class:
'text-plain js-user-link'
,
data:
{
user_id:
user
.
id
}
=
render_if_exists
'admin/users/user_
detail
_note'
,
user:
user
=
render_if_exists
'admin/users/user_
listing
_note'
,
user:
user
-
user_badges_in_admin_section
(
user
).
each
do
|
badge
|
-
css_badge
=
"badge badge-
#{
badge
[
:variant
]
}
"
if
badge
[
:variant
].
present?
...
...
app/views/admin/users/show.html.haml
View file @
a3bbfbae
...
...
@@ -53,6 +53,8 @@
-
else
Disabled
=
render_if_exists
'admin/namespace_plan_info'
,
namespace:
@user
.
namespace
%li
%span
.light
External User:
%strong
...
...
@@ -134,6 +136,8 @@
%strong
=
link_to
@user
.
created_by
.
name
,
[
:admin
,
@user
.
created_by
]
=
render_if_exists
partial:
"namespaces/shared_runner_status"
,
locals:
{
namespace:
@user
.
namespace
}
.col-md-6
-
unless
@user
==
current_user
-
unless
@user
.
confirmed?
...
...
@@ -146,6 +150,9 @@
%p
This user has an unconfirmed email address
#{
email
}
. You may force a confirmation.
%br
=
link_to
'Confirm user'
,
confirm_admin_user_path
(
@user
),
method: :put
,
class:
"btn btn-info"
,
data:
{
confirm:
'Are you sure?'
}
=
render_if_exists
'admin/users/user_detail_note'
-
if
@user
.
blocked?
.card.border-info
.card-header.bg-info.text-white
...
...
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