diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-11 00:06:24 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-11 00:06:24 +0000 |
| commit | 133924c6cc443f5f69e1ab08d43b363d77677cb0 (patch) | |
| tree | e893a7d36105fc4acec7038feae5f03bd34cfc2c /app/views/admin/users | |
| parent | f607152a0802a68067343ad73f989033cb8e9a06 (diff) | |
| download | gitlab-ce-133924c6cc443f5f69e1ab08d43b363d77677cb0.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/admin/users')
| -rw-r--r-- | app/views/admin/users/_user_deactivation_effects.html.haml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/views/admin/users/_user_deactivation_effects.html.haml b/app/views/admin/users/_user_deactivation_effects.html.haml index 6cc47214d77..dc3896e18c0 100644 --- a/app/views/admin/users/_user_deactivation_effects.html.haml +++ b/app/views/admin/users/_user_deactivation_effects.html.haml @@ -10,6 +10,8 @@ %li = s_('AdminUsers|The user will not receive any notifications') %li + = s_('AdminUsers|The user will not be able to use slash commands') + %li = s_('AdminUsers|When the user logs back in, their account will reactivate as a fully active account') %li = s_('AdminUsers|Personal projects, group and user history will be left intact') |