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
c2396171
Commit
c2396171
authored
Aug 08, 2018
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix blocked user card styles
parent
6f21652f
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
2 deletions
+7
-2
app/views/admin/users/show.html.haml
app/views/admin/users/show.html.haml
+2
-2
changelogs/unreleased/50126-blocked-user-card.yml
changelogs/unreleased/50126-blocked-user-card.yml
+5
-0
No files found.
app/views/admin/users/show.html.haml
View file @
c2396171
...
@@ -138,8 +138,8 @@
...
@@ -138,8 +138,8 @@
%br
%br
=
link_to
'Confirm user'
,
confirm_admin_user_path
(
@user
),
method: :put
,
class:
"btn btn-info"
,
data:
{
confirm:
'Are you sure?'
}
=
link_to
'Confirm user'
,
confirm_admin_user_path
(
@user
),
method: :put
,
class:
"btn btn-info"
,
data:
{
confirm:
'Are you sure?'
}
-
if
@user
.
blocked?
-
if
@user
.
blocked?
.card.b
g
-info
.card.b
order
-info
.card-header
.card-header
.bg-info.text-white
This user is blocked
This user is blocked
.card-body
.card-body
%p
A blocked user cannot:
%p
A blocked user cannot:
...
...
changelogs/unreleased/50126-blocked-user-card.yml
0 → 100644
View file @
c2396171
---
title
:
Fix blocked user card style
merge_request
:
author
:
type
:
fixed
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