diff options
| author | Winnie Hellmann <winnie@gitlab.com> | 2018-04-10 21:08:02 +0200 |
|---|---|---|
| committer | Winnie Hellmann <winnie@gitlab.com> | 2018-04-10 21:08:02 +0200 |
| commit | eba70f499aa0d2e0e26c046162f7c1c3dcf5ec12 (patch) | |
| tree | b4f17e7ed612840cdab2c3b5e8bab1f0cba5c6a3 | |
| parent | 977e6849fe0b38f052c1a3297dcd7b52bac9158f (diff) | |
| download | gitlab-ce-eba70f499aa0d2e0e26c046162f7c1c3dcf5ec12.tar.gz | |
Remove green background from unlock button in admin area
| -rw-r--r-- | app/views/admin/users/_user.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/winh-dropdown-entry-unlocking.yml | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/views/admin/users/_user.html.haml b/app/views/admin/users/_user.html.haml index bbfeceff5b9..2ff4221efbd 100644 --- a/app/views/admin/users/_user.html.haml +++ b/app/views/admin/users/_user.html.haml @@ -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? diff --git a/changelogs/unreleased/winh-dropdown-entry-unlocking.yml b/changelogs/unreleased/winh-dropdown-entry-unlocking.yml new file mode 100644 index 00000000000..fc669af1f57 --- /dev/null +++ b/changelogs/unreleased/winh-dropdown-entry-unlocking.yml @@ -0,0 +1,5 @@ +--- +title: Remove green background from unlock button in admin area +merge_request: 18288 +author: +type: changed |