BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
eba70f49
Commit
eba70f49
authored
Apr 10, 2018
by
Winnie Hellmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove green background from unlock button in admin area
parent
977e6849
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
1 deletion
+6
-1
_user.html.haml
app/views/admin/users/_user.html.haml
+1
-1
winh-dropdown-entry-unlocking.yml
changelogs/unreleased/winh-dropdown-entry-unlocking.yml
+5
-0
No files found.
app/views/admin/users/_user.html.haml
View file @
eba70f49
...
...
@@ -33,7 +33,7 @@
=
link_to
'Block'
,
block_admin_user_path
(
user
),
data:
{
confirm:
'USER WILL BE BLOCKED! Are you sure?'
},
method: :put
-
if
user
.
access_locked?
%li
=
link_to
'Unlock'
,
unlock_admin_user_path
(
user
),
method: :put
,
class:
'btn-grouped btn btn-xs btn-success'
,
data:
{
confirm:
'Are you sure?'
}
=
link_to
_
(
'Unlock'
),
unlock_admin_user_path
(
user
),
method: :put
,
data:
{
confirm:
_
(
'Are you sure?'
)
}
-
if
can?
(
current_user
,
:destroy_user
,
user
)
%li
.divider
-
if
user
.
can_be_removed?
...
...
changelogs/unreleased/winh-dropdown-entry-unlocking.yml
0 → 100644
View file @
eba70f49
---
title
:
Remove green background from unlock button in admin area
merge_request
:
18288
author
:
type
:
changed
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