diff options
| author | Elias Werberich <elias@endercoding.com> | 2016-07-31 17:34:27 +0200 |
|---|---|---|
| committer | Elias Werberich <elias@endercoding.com> | 2016-08-02 13:10:02 +0200 |
| commit | a33a2ba0a60930cf617675186f7c59139232b44c (patch) | |
| tree | fa7810ecbc8911fd5ed73162ad3b404f3c7d4b97 | |
| parent | a8851a3c9f54bda636b9bd584db54d38c9290075 (diff) | |
| download | gitlab-ce-a33a2ba0a60930cf617675186f7c59139232b44c.tar.gz | |
Fix confusing description of a blocked user.
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/views/admin/users/show.html.haml | 8 |
2 files changed, 4 insertions, 5 deletions
diff --git a/CHANGELOG b/CHANGELOG index c099c63ce86..b8fca1fe40a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -29,6 +29,7 @@ v 8.11.0 (unreleased) - Remove `search_id` of labels dropdown filter to fix 'Missleading URI for labels in Merge Requests and Issues view'. !5368 (Scott Le) - Load project invited groups and members eagerly in `ProjectTeam#fetch_members` - Bump gitlab_git to speedup DiffCollection iterations + - Rewrite description of a blocked user in admin settings. (Elias Werberich) - Make branches sortable without push permission !5462 (winniehell) - Check for Ci::Build artifacts at database level on pipeline partial - Make "New issue" button in Issue page less obtrusive !5457 (winniehell) diff --git a/app/views/admin/users/show.html.haml b/app/views/admin/users/show.html.haml index d37489bebea..76c9ed0ee8b 100644 --- a/app/views/admin/users/show.html.haml +++ b/app/views/admin/users/show.html.haml @@ -140,12 +140,10 @@ .panel-heading This user is blocked .panel-body - %p Blocking user has the following effects: + %p A blocked user cannot: %ul - %li User will not be able to login - %li User will not be able to access git repositories - %li Personal projects will be left - %li Owned groups will be left + %li Log in + %li Access Git repositories %br = link_to 'Unblock user', unblock_admin_user_path(@user), method: :put, class: "btn btn-info", data: { confirm: 'Are you sure?' } - else |