diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-12-15 18:56:41 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-12-15 18:56:41 +0000 |
| commit | 95f5a525b5a729725d6b559101026b8f39c9c39d (patch) | |
| tree | b1126bf4da1f172b1d04f31971e71ae9a9332133 | |
| parent | 24196763567b61e49721241f05cb1380fba1372e (diff) | |
| parent | e9c11ca3d8cbb7ef1f9860a7462401935f8e93e7 (diff) | |
| download | gitlab-ce-95f5a525b5a729725d6b559101026b8f39c9c39d.tar.gz | |
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
| -rw-r--r-- | app/views/admin/users/show.html.haml | 1 | ||||
| -rw-r--r-- | changelogs/unreleased/remove-incorrect-guidance.yml | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/views/admin/users/show.html.haml b/app/views/admin/users/show.html.haml index 98ff592eb64..63c5a15de1c 100644 --- 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 diff --git a/changelogs/unreleased/remove-incorrect-guidance.yml b/changelogs/unreleased/remove-incorrect-guidance.yml new file mode 100644 index 00000000000..eeb5745698f --- /dev/null +++ b/changelogs/unreleased/remove-incorrect-guidance.yml @@ -0,0 +1,6 @@ +--- +title: Removed incorrect guidance stating blocked users will be removed from groups + and project as members +merge_request: 15947 +author: CesarApodaca +type: fixed |