Commit 2044460b authored by Serena Fang's avatar Serena Fang

Apply MR review suggestions

Apply TW review suggestions
parent 2c4e0ce5
...@@ -168,7 +168,7 @@ module UsersHelper ...@@ -168,7 +168,7 @@ module UsersHelper
method: 'put', method: 'put',
modal_attributes: { modal_attributes: {
title: s_('AdminUsers|Ban user %{username}?') % { username: sanitize_name(user.name) }, title: s_('AdminUsers|Ban user %{username}?') % { username: sanitize_name(user.name) },
message: s_('AdminUsers|You can always unban their account. Their data remains intact.'), message: s_('AdminUsers|You can unban their account in the future. Their data remains intact.'),
okVariant: 'warning', okVariant: 'warning',
okTitle: s_('AdminUsers|Ban') okTitle: s_('AdminUsers|Ban')
}.to_json }.to_json
...@@ -181,7 +181,7 @@ module UsersHelper ...@@ -181,7 +181,7 @@ module UsersHelper
method: 'put', method: 'put',
modal_attributes: { modal_attributes: {
title: s_('AdminUsers|Unban %{username}?') % { username: sanitize_name(user.name) }, title: s_('AdminUsers|Unban %{username}?') % { username: sanitize_name(user.name) },
message: s_('AdminUsers|You can always ban their account again if needed.'), message: s_('AdminUsers|You ban their account in the future if necessary.'),
okVariant: 'info', okVariant: 'info',
okTitle: s_('AdminUsers|Unban') okTitle: s_('AdminUsers|Unban')
}.to_json }.to_json
...@@ -195,7 +195,7 @@ module UsersHelper ...@@ -195,7 +195,7 @@ module UsersHelper
concat tag.li s_('AdminUsers|User will be blocked') concat tag.li s_('AdminUsers|User will be blocked')
end end
link_start = '<a href="%{url}" target="_blank">'.html_safe % { url: help_page_path("user/admin_area/user_moderation", anchor: "banning-a-user") } link_start = '<a href="%{url}" target="_blank">'.html_safe % { url: help_page_path("user/admin_area/moderate_users", anchor: "ban-a-user") }
info = tag.p s_('AdminUsers|Learn more about %{link_start}banned users.%{link_end}').html_safe % { link_start: link_start, link_end: '</a>'.html_safe } info = tag.p s_('AdminUsers|Learn more about %{link_start}banned users.%{link_end}').html_safe % { link_start: link_start, link_end: '</a>'.html_safe }
header + list + info header + list + info
......
...@@ -185,7 +185,7 @@ ...@@ -185,7 +185,7 @@
%ul %ul
%li= _('Log in') %li= _('Log in')
%li= _('Access Git repositories') %li= _('Access Git repositories')
- link_start = '<a href="%{url}" target="_blank">'.html_safe % { url: help_page_path("user/admin_area/user_moderation", anchor: "banning-a-user") } - link_start = '<a href="%{url}" target="_blank">'.html_safe % { url: help_page_path("user/admin_area/moderate_users", anchor: "ban-a-user") }
= s_('AdminUsers|Learn more about %{link_start}banned users.%{link_end}').html_safe % { link_start: link_start, link_end: '</a>'.html_safe } = s_('AdminUsers|Learn more about %{link_start}banned users.%{link_end}').html_safe % { link_start: link_start, link_end: '</a>'.html_safe }
%p %p
%button.btn.gl-button.btn-info.js-confirm-modal-button{ data: user_unban_data(@user) } %button.btn.gl-button.btn-info.js-confirm-modal-button{ data: user_unban_data(@user) }
......
...@@ -48,8 +48,8 @@ using [Seat Link](#seat-link). ...@@ -48,8 +48,8 @@ using [Seat Link](#seat-link).
A _billable user_ counts against the number of subscription seats. Every user is considered a A _billable user_ counts against the number of subscription seats. Every user is considered a
billable user, with the following exceptions: billable user, with the following exceptions:
- [Deactivated users](../../user/admin_area/user_moderation.md#deactivating-a-user) and - [Deactivated users](../../user/admin_area/moderate_users.md#deactivating-a-user) and
[blocked users](../../user/admin_area/user_moderation.md#blocking-a-user) don't count as billable users in the current subscription. When they are either deactivated or blocked they release a _billable user_ seat. However, they may [blocked users](../../user/admin_area/moderate_users.md#blocking-a-user) don't count as billable users in the current subscription. When they are either deactivated or blocked they release a _billable user_ seat. However, they may
count toward overages in the subscribed seat count. count toward overages in the subscribed seat count.
- Users who are [pending approval](../../user/admin_area/approving_users.md). - Users who are [pending approval](../../user/admin_area/approving_users.md).
- Members with Guest permissions on an Ultimate subscription. - Members with Guest permissions on an Ultimate subscription.
...@@ -183,7 +183,7 @@ Starting 30 days before a subscription expires, GitLab notifies administrators o ...@@ -183,7 +183,7 @@ Starting 30 days before a subscription expires, GitLab notifies administrators o
We recommend following these steps during renewal: We recommend following these steps during renewal:
1. Prune any inactive or unwanted users by [blocking them](../../user/admin_area/user_moderation.md#blocking-a-user). 1. Prune any inactive or unwanted users by [blocking them](../../user/admin_area/moderate_users.md#blocking-a-user).
1. Determine if you have a need for user growth in the upcoming subscription. 1. Determine if you have a need for user growth in the upcoming subscription.
1. Log in to the [Customers Portal](https://customers.gitlab.com/customers/sign_in) and select the **Renew** button beneath your existing subscription. 1. Log in to the [Customers Portal](https://customers.gitlab.com/customers/sign_in) and select the **Renew** button beneath your existing subscription.
......
---
stage: Manage
group: Access
info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
type: howto
---
# Activating and deactivating users
GitLab administrators can deactivate and activate users.
## Deactivating a user
> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/22257) in GitLab 12.4.
In order to temporarily prevent access by a GitLab user that has no recent activity, administrators
can choose to deactivate the user.
Deactivating a user is functionally identical to [blocking a user](blocking_unblocking_users.md),
with the following differences:
- It does not prohibit the user from logging back in via the UI.
- Once a deactivated user logs back into the GitLab UI, their account is set to active.
A deactivated user:
- Cannot access Git repositories or the API.
- Will not receive any notifications from GitLab.
- Will not be able to use [slash commands](../../integration/slash_commands.md).
Personal projects, and group and user history of the deactivated user will be left intact.
A user can be deactivated from the Admin Area. To do this:
1. Navigate to **Admin Area > Overview > Users**.
1. Select a user.
1. Under the **Account** tab, click **Deactivate user**.
Please note that for the deactivation option to be visible to an admin, the user:
- Must be currently active.
- Must not have signed in, or have any activity, in the last 90 days.
Users can also be deactivated using the [GitLab API](../../api/users.md#deactivate-user).
NOTE:
A deactivated user does not consume a [seat](../../subscriptions/self_managed/index.md#billable-users).
## Activating a user
> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/22257) in GitLab 12.4.
A deactivated user can be activated from the Admin Area.
To do this:
1. Navigate to **Admin Area > Overview > Users**.
1. Click on the **Deactivated** tab.
1. Select a user.
1. Under the **Account** tab, click **Activate user**.
Users can also be activated using the [GitLab API](../../api/users.md#activate-user).
NOTE:
Activating a user changes the user's state to active and consumes a
[seat](../../subscriptions/self_managed/index.md#billable-users).
NOTE:
A deactivated user can also activate their account themselves by logging back in via the UI.
...@@ -21,7 +21,7 @@ When a user registers for an account while this setting is enabled: ...@@ -21,7 +21,7 @@ When a user registers for an account while this setting is enabled:
A user pending approval: A user pending approval:
- Is functionally identical to a [blocked](user_moderation.md#blocking-a-user) user. - Is functionally identical to a [blocked](moderate_users.md#blocking-a-user) user.
- Cannot sign in. - Cannot sign in.
- Cannot access Git repositories or the GitLab API. - Cannot access Git repositories or the GitLab API.
- Does not receive any notifications from GitLab. - Does not receive any notifications from GitLab.
......
---
stage: Manage
group: Access
info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
type: howto
---
# Blocking and unblocking users
GitLab administrators block and unblock users.
## Blocking a user
In order to completely prevent access of a user to the GitLab instance, administrators can choose to
block the user.
Users can be blocked [via an abuse report](review_abuse_reports.md#blocking-users),
or directly from the Admin Area. To do this:
1. Navigate to **Admin Area > Overview > Users**.
1. Select a user.
1. Under the **Account** tab, click **Block user**.
A blocked user:
- Cannot log in.
- Cannot access Git repositories or the API.
- Does not receive any notifications from GitLab.
- Cannot use [slash commands](../../integration/slash_commands.md).
Personal projects, and group and user history of the blocked user are left intact.
Users can also be blocked using the [GitLab API](../../api/users.md#block-user).
NOTE:
A blocked user does not consume a [seat](../../subscriptions/self_managed/index.md#billable-users).
## Unblocking a user
A blocked user can be unblocked from the Admin Area. To do this:
1. Navigate to **Admin Area > Overview > Users**.
1. Click on the **Blocked** tab.
1. Select a user.
1. Under the **Account** tab, click **Unblock user**.
Users can also be unblocked using the [GitLab API](../../api/users.md#unblock-user).
NOTE:
Unblocking a user changes the user's state to active and consumes a
[seat](../../subscriptions/self_managed/index.md#billable-users).
...@@ -117,8 +117,8 @@ To list users matching a specific criteria, click on one of the following tabs o ...@@ -117,8 +117,8 @@ To list users matching a specific criteria, click on one of the following tabs o
- **2FA Enabled** - **2FA Enabled**
- **2FA Disabled** - **2FA Disabled**
- **External** - **External**
- **[Blocked](user_moderation.md#blocking-a-user)** - **[Blocked](moderate_users.md#blocking-a-user)**
- **[Deactivated](user_moderation.md#deactivating-a-user)** - **[Deactivated](moderate_users.md#deactivating-a-user)**
- **Without projects** - **Without projects**
For each user, the following are listed: For each user, the following are listed:
......
...@@ -5,7 +5,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w ...@@ -5,7 +5,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
type: howto type: howto
--- ---
# User moderation # Moderate users
GitLab administrators can moderate user access by blocking, banning, or deactivating users. GitLab administrators can moderate user access by blocking, banning, or deactivating users.
...@@ -117,7 +117,7 @@ Activating a user changes the user's state to active and consumes a ...@@ -117,7 +117,7 @@ Activating a user changes the user's state to active and consumes a
NOTE: NOTE:
A deactivated user can also activate their account themselves by logging back in via the UI. A deactivated user can also activate their account themselves by logging back in via the UI.
## Banning and unbanning users ## Ban and unban users
GitLab administrators can ban users. GitLab administrators can ban users.
...@@ -126,12 +126,12 @@ This feature is behind a feature flag that is disabled by default. GitLab admini ...@@ -126,12 +126,12 @@ This feature is behind a feature flag that is disabled by default. GitLab admini
with access to the GitLab Rails console can [enable](../../administration/feature_flags.md) with access to the GitLab Rails console can [enable](../../administration/feature_flags.md)
this feature for your GitLab instance. this feature for your GitLab instance.
### Banning a user ### Ban a user
In order to completely block a user and hide the user's comments and issues from other users, To completely block a user and hide the user's comments and issues from other users,
administrators can choose to ban the user. administrators can choose to ban the user.
Users can be banned from the Admin Area. To do this: Users can be banned using the Admin Area. To do this:
1. Navigate to **Admin Area > Overview > Users**. 1. Navigate to **Admin Area > Overview > Users**.
1. Select a user. 1. Select a user.
...@@ -150,9 +150,9 @@ This feature is a work in progress. Currently, banning a user ...@@ -150,9 +150,9 @@ This feature is a work in progress. Currently, banning a user
only blocks them and does not hide their comments or issues. only blocks them and does not hide their comments or issues.
This functionality will be implemented in follow up issues. This functionality will be implemented in follow up issues.
### Unbanning a user ### Unban a user
A banned user can be unbanned from the Admin Area. To do this: A banned user can be unbanned using the Admin Area. To do this:
1. Navigate to **Admin Area > Overview > Users**. 1. Navigate to **Admin Area > Overview > Users**.
1. Click on the **Banned** tab. 1. Click on the **Banned** tab.
......
...@@ -69,7 +69,7 @@ username of the original user. ...@@ -69,7 +69,7 @@ username of the original user.
When using the **Delete user and contributions** option, **all** associated records When using the **Delete user and contributions** option, **all** associated records
are removed. This includes all of the items mentioned above including issues, are removed. This includes all of the items mentioned above including issues,
merge requests, notes/comments, and more. Consider merge requests, notes/comments, and more. Consider
[blocking a user](../../admin_area/user_moderation.md#blocking-a-user) [blocking a user](../../admin_area/moderate_users.md#blocking-a-user)
or using the **Delete user** option instead. or using the **Delete user** option instead.
When a user is deleted from an [abuse report](../../admin_area/review_abuse_reports.md) When a user is deleted from an [abuse report](../../admin_area/review_abuse_reports.md)
......
...@@ -73,7 +73,7 @@ Your account has been blocked. Fatal: Could not read from remote repository ...@@ -73,7 +73,7 @@ Your account has been blocked. Fatal: Could not read from remote repository
Your primary email address is not confirmed. Your primary email address is not confirmed.
``` ```
You can assure your users that they have not been [Blocked](admin_area/user_moderation.md#blocking-and-unblocking-users) by an administrator. You can assure your users that they have not been [Blocked](admin_area/moderate_users.md#blocking-and-unblocking-users) by an administrator.
When affected users see this message, they must confirm their email address before they can commit code. When affected users see this message, they must confirm their email address before they can commit code.
## What do I need to know as an administrator of a GitLab self-managed Instance? ## What do I need to know as an administrator of a GitLab self-managed Instance?
......
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