Commit a33a2ba0 authored by Elias Werberich's avatar Elias Werberich

Fix confusing description of a blocked user.

parent a8851a3c
...@@ -29,6 +29,7 @@ v 8.11.0 (unreleased) ...@@ -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) - 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` - Load project invited groups and members eagerly in `ProjectTeam#fetch_members`
- Bump gitlab_git to speedup DiffCollection iterations - 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) - Make branches sortable without push permission !5462 (winniehell)
- Check for Ci::Build artifacts at database level on pipeline partial - Check for Ci::Build artifacts at database level on pipeline partial
- Make "New issue" button in Issue page less obtrusive !5457 (winniehell) - Make "New issue" button in Issue page less obtrusive !5457 (winniehell)
......
...@@ -140,12 +140,10 @@ ...@@ -140,12 +140,10 @@
.panel-heading .panel-heading
This user is blocked This user is blocked
.panel-body .panel-body
%p Blocking user has the following effects: %p A blocked user cannot:
%ul %ul
%li User will not be able to login %li Log in
%li User will not be able to access git repositories %li Access Git repositories
%li Personal projects will be left
%li Owned groups will be left
%br %br
= link_to 'Unblock user', unblock_admin_user_path(@user), method: :put, class: "btn btn-info", data: { confirm: 'Are you sure?' } = link_to 'Unblock user', unblock_admin_user_path(@user), method: :put, class: "btn btn-info", data: { confirm: 'Are you sure?' }
- else - else
......
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