Commit 8e0e9d6d authored by Phil Hughes's avatar Phil Hughes

Merge branch 'winh-dropdown-entry-unlocking' into 'master'

Remove green background from unlock button in admin area

Closes #41269

See merge request gitlab-org/gitlab-ce!18288
parents db6854b2 eba70f49
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
= link_to 'Block', block_admin_user_path(user), data: { confirm: 'USER WILL BE BLOCKED! Are you sure?' }, method: :put = link_to 'Block', block_admin_user_path(user), data: { confirm: 'USER WILL BE BLOCKED! Are you sure?' }, method: :put
- if user.access_locked? - if user.access_locked?
%li %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) - if can?(current_user, :destroy_user, user)
%li.divider %li.divider
- if user.can_be_removed? - if user.can_be_removed?
......
---
title: Remove green background from unlock button in admin area
merge_request: 18288
author:
type: changed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment