Commit 23f558b6 authored by Kacper Walanus's avatar Kacper Walanus Committed by Marcin Sedlak-Jakubowski

Make abuse reports topics more descriptive for easier searching

parent 69bd1adf
...@@ -139,7 +139,7 @@ Learn how to install, configure, update, and maintain your GitLab instance. ...@@ -139,7 +139,7 @@ Learn how to install, configure, update, and maintain your GitLab instance.
- [Postfix for incoming email](reply_by_email_postfix_setup.md): Set up a - [Postfix for incoming email](reply_by_email_postfix_setup.md): Set up a
basic Postfix mail server with IMAP authentication on Ubuntu for incoming basic Postfix mail server with IMAP authentication on Ubuntu for incoming
emails. emails.
- [Abuse reports](../user/admin_area/abuse_reports.md): View and resolve abuse reports from your users. - [Abuse reports](../user/admin_area/review_abuse_reports.md): View and resolve abuse reports from your users.
- [Credentials Inventory](../user/admin_area/credentials_inventory.md): With Credentials inventory, GitLab administrators can keep track of the credentials used by their users in their GitLab self-managed instance. - [Credentials Inventory](../user/admin_area/credentials_inventory.md): With Credentials inventory, GitLab administrators can keep track of the credentials used by their users in their GitLab self-managed instance.
## Project settings ## Project settings
......
...@@ -217,8 +217,8 @@ listed in the descriptions of the relevant settings. ...@@ -217,8 +217,8 @@ listed in the descriptions of the relevant settings.
| Attribute | Type | Required | Description | | Attribute | Type | Required | Description |
|------------------------------------------|------------------|:------------------------------------:|-------------| |------------------------------------------|------------------|:------------------------------------:|-------------|
| `admin_mode` | boolean | no | Require admins to enable Admin Mode by re-authenticating for administrative tasks. | | `admin_mode` | boolean | no | Require admins to enable Admin Mode by re-authenticating for administrative tasks. |
| `admin_notification_email` | string | no | Deprecated: Use `abuse_notification_email` instead. If set, [abuse reports](../user/admin_area/abuse_reports.md) are sent to this address. Abuse reports are always available in the Admin Area. | | `admin_notification_email` | string | no | Deprecated: Use `abuse_notification_email` instead. If set, [abuse reports](../user/admin_area/review_abuse_reports.md) are sent to this address. Abuse reports are always available in the Admin Area. |
| `abuse_notification_email` | string | no | If set, [abuse reports](../user/admin_area/abuse_reports.md) are sent to this address. Abuse reports are always available in the Admin Area. | | `abuse_notification_email` | string | no | If set, [abuse reports](../user/admin_area/review_abuse_reports.md) are sent to this address. Abuse reports are always available in the Admin Area. |
| `after_sign_out_path` | string | no | Where to redirect users after logout. | | `after_sign_out_path` | string | no | Where to redirect users after logout. |
| `after_sign_up_text` | string | no | Text shown to the user after signing up | | `after_sign_up_text` | string | no | Text shown to the user after signing up |
| `akismet_api_key` | string | required by: `akismet_enabled` | API key for Akismet spam protection. | | `akismet_api_key` | string | required by: `akismet_enabled` | API key for Akismet spam protection. |
......
--- ---
stage: none redirect_to: 'report_abuse.md'
group: unassigned
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
--- ---
# Abuse reports **(FREE)** This file was moved to [another location](report_abuse.md).
You can report abuse from other GitLab users to GitLab administrators. <!-- This redirect file can be deleted after <2021-07-21>. -->
<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->
A GitLab administrator [can then choose](admin_area/abuse_reports.md) to:
- Remove the user, which deletes them from the instance.
- Block the user, which denies them access to the instance.
- Or remove the report, which retains the user's access to the instance.
You can report a user through their:
- [Profile](#reporting-abuse-through-a-users-profile)
- [Comments](#reporting-abuse-through-a-users-comment)
- [Issues and Merge requests](#reporting-abuse-through-a-users-issue-or-merge-request)
## Reporting abuse through a user's profile
To report abuse from a user's profile page:
1. Click on the exclamation point report abuse button at the top right of the
user's profile.
1. Complete an abuse report.
1. Click the **Send report** button.
## Reporting abuse through a user's comment
To report abuse from a user's comment:
1. Click on the vertical ellipsis (⋮) more actions button to open the dropdown.
1. Select **Report as abuse**.
1. Complete an abuse report.
1. Click the **Send report** button.
NOTE:
A URL to the reported user's comment is pre-filled in the abuse report's
**Message** field.
## Reporting abuse through a user's issue or merge request
The **Report abuse** button is displayed at the top right of the issue or merge request:
- When **Report abuse** is selected from the menu that appears when the
**Close issue** or **Close merge request** button is clicked, for users that
have permission to close the issue or merge request.
- When viewing the issue or merge request, for users that don't have permission
to close the issue or merge request.
With the **Report abuse** button displayed, to submit an abuse report:
1. Click the **Report abuse** button.
1. Submit an abuse report.
1. Click the **Send report** button.
NOTE:
A URL to the reported user's issue or merge request is pre-filled
in the abuse report's **Message** field.
## Managing abuse reports
Admins are able to view and resolve abuse reports.
For more information, see [abuse reports administration documentation](admin_area/abuse_reports.md).
--- ---
stage: Manage redirect_to: 'review_abuse_reports.md'
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: reference, howto
--- ---
# Abuse reports **(FREE SELF)** This file was moved to [another location](review_abuse_reports.md).
View and resolve abuse reports from GitLab users. <!-- This redirect file can be deleted after <2021-07-21>. -->
<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->
GitLab administrators can view and [resolve](#resolving-abuse-reports) abuse
reports in the Admin Area.
## Receiving notifications of abuse reports
To receive notifications of new abuse reports by e-mail, follow these steps:
1. Select **Admin Area > Settings > Reporting**.
1. Expand the **Abuse reports** section.
1. Provide an email address.
The notification email address can also be set and retrieved
[using the API](../../api/settings.md#list-of-settings-that-can-be-accessed-via-api-calls).
## Reporting abuse
To find out more about reporting abuse, see [abuse reports user
documentation](../abuse_reports.md).
## Resolving abuse reports
To access abuse reports, go to **Admin Area > Abuse Reports**.
There are 3 ways to resolve an abuse report, with a button for each method:
- Remove user & report. This:
- [Deletes the reported user](../profile/account/delete_account.md) from the
instance.
- Removes the abuse report from the list.
- [Block user](#blocking-users).
- Remove report. This:
- Removes the abuse report from the list.
- Removes access restrictions for the reported user.
The following is an example of the **Abuse Reports** page:
![abuse-reports-page-image](img/abuse_reports_page_v13_11.png)
### Blocking users
A blocked user cannot log in or access any repositories, but all of their data
remains.
Blocking a user:
- Leaves them in the abuse report list.
- Changes the **Block user** button to a disabled **Already blocked** button.
The user is notified with the following message:
```plaintext
Your account has been blocked. If you believe this is in error, contact a staff member.
```
After blocking, you can still either:
- Remove the user and report if necessary.
- Remove the report.
The following is an example of a blocked user listed on the **Abuse Reports**
page:
![abuse-report-blocked-user-image](img/abuse_report_blocked_user.png)
NOTE:
Users can be [blocked](../../api/users.md#block-user) and
[unblocked](../../api/users.md#unblock-user) using the GitLab API.
<!-- ## Troubleshooting
Include any troubleshooting steps that you can foresee. If you know beforehand what issues
one might have when setting this up, or when something is changed, or on upgrading, it's
important to describe those, too. Think of things that may go wrong and include them here.
This is important to minimize requests for support, and to avoid doc comments with
questions that you know someone might ask.
Each scenario can be a third-level heading, e.g. `### Getting error message X`.
If you have none to add when creating a doc, leave this section in place
but commented out to help encourage others to add to it in the future. -->
...@@ -14,7 +14,7 @@ GitLab administrators block and unblock users. ...@@ -14,7 +14,7 @@ GitLab administrators block and unblock users.
In order to completely prevent access of a user to the GitLab instance, administrators can choose to In order to completely prevent access of a user to the GitLab instance, administrators can choose to
block the user. block the user.
Users can be blocked [via an abuse report](abuse_reports.md#blocking-users), Users can be blocked [via an abuse report](review_abuse_reports.md#blocking-users),
or directly from the Admin Area. To do this: or directly from the Admin Area. To do this:
1. Navigate to **Admin Area > Overview > Users**. 1. Navigate to **Admin Area > Overview > Users**.
......
...@@ -28,7 +28,7 @@ The Admin Area is made up of the following sections: ...@@ -28,7 +28,7 @@ The Admin Area is made up of the following sections:
| **{messages}** Messages | Send and manage [broadcast messages](broadcast_messages.md) for your users. | | **{messages}** Messages | Send and manage [broadcast messages](broadcast_messages.md) for your users. |
| **{hook}** System Hooks | Configure [system hooks](../../system_hooks/system_hooks.md) for many events. | | **{hook}** System Hooks | Configure [system hooks](../../system_hooks/system_hooks.md) for many events. |
| **{applications}** Applications | Create system [OAuth applications](../../integration/oauth_provider.md) for integrations with other services. | | **{applications}** Applications | Create system [OAuth applications](../../integration/oauth_provider.md) for integrations with other services. |
| **{slight-frown}** Abuse Reports | Manage [abuse reports](abuse_reports.md) submitted by your users. | | **{slight-frown}** Abuse Reports | Manage [abuse reports](review_abuse_reports.md) submitted by your users. |
| **{license}** License | Upload, display, and remove [licenses](license.md). | | **{license}** License | Upload, display, and remove [licenses](license.md). |
| **{cloud-gear}** Kubernetes | Create and manage instance-level [Kubernetes clusters](../instance/clusters/index.md). | | **{cloud-gear}** Kubernetes | Create and manage instance-level [Kubernetes clusters](../instance/clusters/index.md). |
| **{push-rules}** Push rules | Configure pre-defined Git [push rules](../../push_rules/push_rules.md) for projects. Also, configure [merge requests approvers rules](merge_requests_approvals.md). | | **{push-rules}** Push rules | Configure pre-defined Git [push rules](../../push_rules/push_rules.md) for projects. Also, configure [merge requests approvers rules](merge_requests_approvals.md). |
......
---
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: reference, howto
---
# Review abuse reports **(FREE SELF)**
View and resolve abuse reports from GitLab users.
GitLab administrators can view and [resolve](#resolving-abuse-reports) abuse
reports in the Admin Area.
## Receiving notifications of abuse reports
To receive notifications of new abuse reports by e-mail, follow these steps:
1. Select **Admin Area > Settings > Reporting**.
1. Expand the **Abuse reports** section.
1. Provide an email address.
The notification email address can also be set and retrieved
[using the API](../../api/settings.md#list-of-settings-that-can-be-accessed-via-api-calls).
## Reporting abuse
To find out more about reporting abuse, see [abuse reports user
documentation](../report_abuse.md).
## Resolving abuse reports
To access abuse reports, go to **Admin Area > Abuse Reports**.
There are 3 ways to resolve an abuse report, with a button for each method:
- Remove user & report. This:
- [Deletes the reported user](../profile/account/delete_account.md) from the
instance.
- Removes the abuse report from the list.
- [Block user](#blocking-users).
- Remove report. This:
- Removes the abuse report from the list.
- Removes access restrictions for the reported user.
The following is an example of the **Abuse Reports** page:
![abuse-reports-page-image](img/abuse_reports_page_v13_11.png)
### Blocking users
A blocked user cannot log in or access any repositories, but all of their data
remains.
Blocking a user:
- Leaves them in the abuse report list.
- Changes the **Block user** button to a disabled **Already blocked** button.
The user is notified with the following message:
```plaintext
Your account has been blocked. If you believe this is in error, contact a staff member.
```
After blocking, you can still either:
- Remove the user and report if necessary.
- Remove the report.
The following is an example of a blocked user listed on the **Abuse Reports**
page:
![abuse-report-blocked-user-image](img/abuse_report_blocked_user.png)
NOTE:
Users can be [blocked](../../api/users.md#block-user) and
[unblocked](../../api/users.md#unblock-user) using the GitLab API.
<!-- ## Troubleshooting
Include any troubleshooting steps that you can foresee. If you know beforehand what issues
one might have when setting this up, or when something is changed, or on upgrading, it's
important to describe those, too. Think of things that may go wrong and include them here.
This is important to minimize requests for support, and to avoid doc comments with
questions that you know someone might ask.
Each scenario can be a third-level heading, e.g. `### Getting error message X`.
If you have none to add when creating a doc, leave this section in place
but commented out to help encourage others to add to it in the future. -->
...@@ -72,7 +72,7 @@ Access the default page for admin area settings by navigating to **Admin Area > ...@@ -72,7 +72,7 @@ Access the default page for admin area settings by navigating to **Admin Area >
| Option | Description | | Option | Description |
| ------ | ----------- | | ------ | ----------- |
| [Spam and Anti-bot Protection](../../../integration/recaptcha.md) | Enable reCAPTCHA or Akismet and set IP limits. For reCAPTCHA, we currently only support [v2](https://developers.google.com/recaptcha/docs/versions). | | [Spam and Anti-bot Protection](../../../integration/recaptcha.md) | Enable reCAPTCHA or Akismet and set IP limits. For reCAPTCHA, we currently only support [v2](https://developers.google.com/recaptcha/docs/versions). |
| [Abuse reports](../abuse_reports.md) | Set notification email for abuse reports. | | [Abuse reports](../review_abuse_reports.md) | Set notification email for abuse reports. |
## Metrics and profiling ## Metrics and profiling
......
...@@ -119,7 +119,7 @@ to enjoy the best of GitLab. ...@@ -119,7 +119,7 @@ to enjoy the best of GitLab.
user type (guest, reporter, developer, maintainer, owner). user type (guest, reporter, developer, maintainer, owner).
- [Feature highlight](feature_highlight.md): Learn more about the little blue dots - [Feature highlight](feature_highlight.md): Learn more about the little blue dots
around the app that explain certain features. around the app that explain certain features.
- [Abuse reports](abuse_reports.md): Report abuse from users to GitLab administrators. - [Abuse reports](report_abuse.md): Report abuse from users to GitLab administrators.
## Groups ## Groups
......
...@@ -72,7 +72,7 @@ merge requests, notes/comments, and more. Consider ...@@ -72,7 +72,7 @@ merge requests, notes/comments, and more. Consider
[blocking a user](../../admin_area/blocking_unblocking_users.md) [blocking a user](../../admin_area/blocking_unblocking_users.md)
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/abuse_reports.md) When a user is deleted from an [abuse report](../../admin_area/review_abuse_reports.md)
or spam log, these associated or spam log, these associated
records are not ghosted and will be removed, along with any groups the user records are not ghosted and will be removed, along with any groups the user
is a sole owner of. Administrators can also request this behavior when is a sole owner of. Administrators can also request this behavior when
......
...@@ -67,7 +67,7 @@ To access additional actions, select the vertical ellipsis ...@@ -67,7 +67,7 @@ To access additional actions, select the vertical ellipsis
- To create a new issue in the same project, select **New issue** in the dropdown menu. - To create a new issue in the same project, select **New issue** in the dropdown menu.
- If you are not the issue author, you can [submit an abuse report](../../abuse_reports.md). - If you are not the issue author, you can [submit an abuse report](../../report_abuse.md).
Select **Report abuse** in the dropdown menu. Select **Report abuse** in the dropdown menu.
### To Do ### To Do
......
---
stage: none
group: unassigned
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
---
# Report abuse **(FREE)**
You can report abuse from other GitLab users to GitLab administrators.
A GitLab administrator [can then choose](admin_area/review_abuse_reports.md) to:
- Remove the user, which deletes them from the instance.
- Block the user, which denies them access to the instance.
- Or remove the report, which retains the user's access to the instance.
You can report a user through their:
- [Profile](#reporting-abuse-through-a-users-profile)
- [Comments](#reporting-abuse-through-a-users-comment)
- [Issues and Merge requests](#reporting-abuse-through-a-users-issue-or-merge-request)
## Reporting abuse through a user's profile
To report abuse from a user's profile page:
1. Click on the exclamation point report abuse button at the top right of the
user's profile.
1. Complete an abuse report.
1. Click the **Send report** button.
## Reporting abuse through a user's comment
To report abuse from a user's comment:
1. Click on the vertical ellipsis (⋮) more actions button to open the dropdown.
1. Select **Report as abuse**.
1. Complete an abuse report.
1. Click the **Send report** button.
NOTE:
A URL to the reported user's comment is pre-filled in the abuse report's
**Message** field.
## Reporting abuse through a user's issue or merge request
The **Report abuse** button is displayed at the top right of the issue or merge request:
- When **Report abuse** is selected from the menu that appears when the
**Close issue** or **Close merge request** button is clicked, for users that
have permission to close the issue or merge request.
- When viewing the issue or merge request, for users that don't have permission
to close the issue or merge request.
With the **Report abuse** button displayed, to submit an abuse report:
1. Click the **Report abuse** button.
1. Submit an abuse report.
1. Click the **Send report** button.
NOTE:
A URL to the reported user's issue or merge request is pre-filled
in the abuse report's **Message** field.
## Managing abuse reports
Admins are able to view and resolve abuse reports.
For more information, see [abuse reports administration documentation](admin_area/review_abuse_reports.md).
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