diff options
| author | Phil Hughes <me@iamphill.com> | 2018-04-12 09:37:40 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-04-12 09:37:40 +0000 |
| commit | 8e0e9d6dd5b8c283d16bd447ee052203590a391a (patch) | |
| tree | 858215658870a3d68c8d86e1fd871672299a822a /app | |
| parent | db6854b2cd44a168af172394a8fbf1965f0c54c5 (diff) | |
| parent | eba70f499aa0d2e0e26c046162f7c1c3dcf5ec12 (diff) | |
| download | gitlab-ce-8e0e9d6dd5b8c283d16bd447ee052203590a391a.tar.gz | |
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
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/admin/users/_user.html.haml | 2 |
1 files changed, 1 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? |