diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-08-04 10:15:50 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-08-04 10:15:50 +0000 |
| commit | d9a449a00bf72f20c4486302ace98b8a8b926b0a (patch) | |
| tree | dda26527d53a5dcc7d4d76e43524b3cf2066a238 | |
| parent | 6ffafc79460bcfef29d8a1b3a30e8a1104f94d32 (diff) | |
| parent | a33a2ba0a60930cf617675186f7c59139232b44c (diff) | |
| download | gitlab-ce-d9a449a00bf72f20c4486302ace98b8a8b926b0a.tar.gz | |
Merge branch 'fix/confusing-blocked-user-description' into 'master'
Fix confusing description of a blocked user.
## What does this MR do?
Rewrite confusing description of a blocked user in admin settings. If someone is blocked, the same message is displayed as if he is unblocked.
## Are there points in the code the reviewer needs to double check?
No.
## Why was this MR needed?
Because it seems that this is a cosmetic bug.
## What are the relevant issue numbers?
None.
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [x] API support added
- Tests
- [x] Added for this feature/bug
- [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !5582
| -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 e388c7a3cc6..9195aa45202 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -40,6 +40,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 - Convert image diff background image to CSS (ClemMakesApps) 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 |