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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
6404d697
Commit
6404d697
authored
Oct 16, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Better UX for blocked users in admin area
parent
e9142c6f
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
25 additions
and
14 deletions
+25
-14
app/views/admin/users/show.html.haml
app/views/admin/users/show.html.haml
+25
-14
No files found.
app/views/admin/users/show.html.haml
View file @
6404d697
%h3
.page-title
%h3
.page-title
User:
%span
.cgray
User:
=
@user
.
name
=
@user
.
name
-
if
@user
.
blocked?
-
if
@user
.
blocked?
%span
.cred
(Blocked)
%span
.cred
(Blocked)
...
@@ -10,8 +10,6 @@
...
@@ -10,8 +10,6 @@
=
link_to
edit_admin_user_path
(
@user
),
class:
"btn grouped"
do
=
link_to
edit_admin_user_path
(
@user
),
class:
"btn grouped"
do
%i
.icon-edit
%i
.icon-edit
Edit
Edit
-
if
@user
.
blocked?
=
link_to
'Unblock'
,
unblock_admin_user_path
(
@user
),
method: :put
,
class:
"btn grouped success"
%hr
%hr
.row
.row
...
@@ -67,8 +65,21 @@
...
@@ -67,8 +65,21 @@
=
link_to
@user
.
created_by
.
name
,
[
:admin
,
@user
.
created_by
]
=
link_to
@user
.
created_by
.
name
,
[
:admin
,
@user
.
created_by
]
-
unless
@user
==
current_user
-
unless
@user
==
current_user
-
if
@user
.
blocked?
.alert.alert-info
%h4
This user is blocked
%br
%p
Blocking user has the following effects:
%ul
%li
User will not be able to login
%li
User will not be able to access git repositories
%li
User will be removed from joined projects and groups
%li
Personal projects will be left
%li
Owned groups will be left
=
link_to
'Unblock user'
,
unblock_admin_user_path
(
@user
),
method: :put
,
class:
"btn btn-new"
,
confirm:
'Are you sure?'
-
else
.alert
.alert
%h4
Block
user
%h4
Block this
user
%br
%br
%p
Blocking user has the following effects:
%p
Blocking user has the following effects:
%ul
%ul
...
...
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