Merge branch 'master' into 'master'

fix issue #39843 Incorrect guidance stating blocked users will be removed from groups and projects as members Closes #39843 See merge request gitlab-org/gitlab-ce!15947

Merge branch 'master' into 'master'
95f5a525 · Rémy Coutable · 24196763 · e9c11ca3 · 95f5a525 · 95f5a525
Commit 95f5a525 authored Dec 15, 2017 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

show.html.haml app/views/admin/users/show.html.haml +0 -1

remove-incorrect-guidance.yml changelogs/unreleased/remove-incorrect-guidance.yml +6 -0

No files found.
--- a/app/views/admin/users/show.html.haml
+++ b/app/views/admin/users/show.html.haml
@@ -157,7 +157,6 @@
            %ul
              %li User will not be able to login
              %li User will not be able to access git repositories
-              %li User will be removed from joined projects and groups
              %li Personal projects will be left
              %li Owned groups will be left
            %br

--- a/changelogs/unreleased/remove-incorrect-guidance.yml
+++ b/changelogs/unreleased/remove-incorrect-guidance.yml
+---
+title: Removed incorrect guidance stating blocked users will be removed from groups
+  and project as members
+merge_request: 15947
+author: CesarApodaca
+type: fixed