diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-25 06:13:04 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-25 06:13:04 +0300 |
commit | 2a6724602aebe899c405c84d1b309558c25b18f7 (patch) | |
tree | 6eedc48dc82bb1cdbeff30705473a6ca56462d53 /doc | |
parent | 4f79a3041736aadda887ebec4178731eb8681cff (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc')
-rw-r--r-- | doc/user/profile/unknown_sign_in_notification.md | 3 | ||||
-rw-r--r-- | doc/user/project/pages/getting_started/pages_forked_sample_project.md | 4 | ||||
-rw-r--r-- | doc/user/project/releases/release_cli.md | 3 | ||||
-rw-r--r-- | doc/user/project/settings/index.md | 12 | ||||
-rw-r--r-- | doc/user/report_abuse.md | 30 |
5 files changed, 25 insertions, 27 deletions
diff --git a/doc/user/profile/unknown_sign_in_notification.md b/doc/user/profile/unknown_sign_in_notification.md index 7aa1ae89c9f..be86db3daf5 100644 --- a/doc/user/profile/unknown_sign_in_notification.md +++ b/doc/user/profile/unknown_sign_in_notification.md @@ -1,11 +1,10 @@ --- -type: concepts, howto 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 --- -# Email notification for unknown sign-ins +# Email notification for unknown sign-ins **(FREE)** > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/27211) in GitLab 13.0. diff --git a/doc/user/project/pages/getting_started/pages_forked_sample_project.md b/doc/user/project/pages/getting_started/pages_forked_sample_project.md index 386ed566225..7640bf1f72d 100644 --- a/doc/user/project/pages/getting_started/pages_forked_sample_project.md +++ b/doc/user/project/pages/getting_started/pages_forked_sample_project.md @@ -31,13 +31,13 @@ that immediately publishes your changes to the Pages site. You can take some **optional** further steps: -- _Remove the fork relationship._ If you want to contribute to the project you forked from, +- Remove the fork relationship. If you want to contribute to the project you forked from, you can keep this relationship. Otherwise, go to your project's **Settings > General**, expand **Advanced settings**, and scroll down to **Remove fork relationship**: ![Remove fork relationship](../img/remove_fork_relationship_v13_1.png) -- _Change the URL to match your namespace._ If your Pages site is hosted on GitLab.com, +- Change the URL to match your namespace. If your Pages site is hosted on GitLab.com, you can rename it to `<namespace>.gitlab.io`, where `<namespace>` is your GitLab namespace (the one you chose when you forked the project). diff --git a/doc/user/project/releases/release_cli.md b/doc/user/project/releases/release_cli.md index c23ceaa1aba..b55f0b0a734 100644 --- a/doc/user/project/releases/release_cli.md +++ b/doc/user/project/releases/release_cli.md @@ -1,11 +1,10 @@ --- -type: reference, howto stage: Release group: Release 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 --- -# Install the `release-cli` for the Shell executor +# Install the `release-cli` for the Shell executor **(FREE)** > - [Introduced](https://gitlab.com/gitlab-org/release-cli/-/issues/21) in GitLab 13.8. > - [Changed](https://gitlab.com/gitlab-org/release-cli/-/merge_requests/108) in GitLab 14.2, the `release-cli` binaries are also [available in the Package Registry](https://gitlab.com/jaime/release-cli/-/packages). diff --git a/doc/user/project/settings/index.md b/doc/user/project/settings/index.md index 45bd10bf9c3..c6cbd45a6ab 100644 --- a/doc/user/project/settings/index.md +++ b/doc/user/project/settings/index.md @@ -7,18 +7,18 @@ type: reference, index, howto # Project settings **(FREE)** -NOTE: -Only project maintainers and administrators have the [permissions](../../permissions.md#project-members-permissions) -to access project settings. - The **Settings** page in GitLab provides a centralized home for your [project](../index.md) configuration options. To access it, go to your project's homepage -and, in the left navigation menu, clicking **Settings**. To reduce complexity, settings are -grouped by topic into sections. To display all settings in a section, click **Expand**. +and, in the left navigation menu, select **Settings**. To reduce complexity, settings are +grouped by topic into sections. To display all settings in a section, select **Expand**. In GitLab versions [13.10 and later](https://gitlab.com/groups/gitlab-org/-/epics/4842), GitLab displays a search box to help you find the settings you want to view. +NOTE: +Only users who have the [Maintainer role](../../permissions.md) for the project and administrators can +access project settings. + ## General settings Under a project's general settings, you can find everything concerning the diff --git a/doc/user/report_abuse.md b/doc/user/report_abuse.md index dcb50aec3d5..c0fb29b435a 100644 --- a/doc/user/report_abuse.md +++ b/doc/user/report_abuse.md @@ -18,14 +18,16 @@ You can report a user through their: - [Profile](#report-abuse-from-the-users-profile-page) - [Comments](#report-abuse-from-a-users-comment) -- [Issues and Merge requests](#report-abuse-through-a-users-issue-or-merge-request) +- [Issues](#report-abuse-from-an-issue) +- [Merge requests](#report-abuse-from-a-merge-request) - [Snippets](snippets.md#mark-snippet-as-spam) ## Report abuse from the user's profile page To report abuse from a user's profile page: -1. In the top right corner of the user's profile, select the exclamation point report abuse button. +1. Anywhere in GitLab, select the name of the user. +1. In the top right corner of the user's profile, select **Report abuse** (**{information-o}**). 1. Complete an abuse report. 1. Select **Send report**. @@ -33,7 +35,7 @@ To report abuse from a user's profile page: To report abuse from a user's comment: -1. In the comment, select the vertical ellipsis (**{ellipsis_v}**). +1. In the comment, in the top right corner, select **More actions** (**{ellipsis_v}**). 1. Select **Report abuse to admin**. 1. Complete an abuse report. 1. Select **Send report**. @@ -42,23 +44,21 @@ NOTE: A URL to the reported user's comment is pre-filled in the abuse report's **Message** field. -## Report 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. For users -with permission to close the issue or merge request, the button is available when you select -**Close issue** or **Close merge request**. For all other users, it is available when viewing the -issue or -merge request. - -With the **Report abuse** button displayed, to submit an abuse report: +## Report abuse from an issue +1. On the issue, in the top right corner, select the vertical ellipsis (**{ellipsis_v}**). 1. Select **Report abuse**. 1. Submit an abuse report. 1. Select **Send report**. -NOTE: -A URL to the reported user's issue or merge request is pre-filled -in the abuse report's **Message** field. +## Report abuse from a merge request + +1. On the merge request, in the top right corner, either: + - Select **Report abuse**. This option is displayed if you do not have permission to close the merge request. + - Next to **Mark as draft**, select the down arrow (**{chevron-down}**) and then select **Report abuse**. + This option is displayed if you have permission to close the merge request. +1. Submit an abuse report. +1. Select **Send report**. ## Related topics |