diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-19 21:10:08 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-19 21:10:08 +0300 |
commit | 91aa6c6479ec883328ae656ab70d6fc3824b5673 (patch) | |
tree | 2369df14bf70f9b4d6bf38d2a23ee30b6375a1bb /doc/user | |
parent | 51238b2afe1ef4783b41368fa1e22b50f473c070 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user')
-rw-r--r-- | doc/user/enterprise_user/index.md | 11 | ||||
-rw-r--r-- | doc/user/group/manage.md | 4 | ||||
-rw-r--r-- | doc/user/project/merge_requests/approvals/img/approvals_premium_mr_widget_16_0.png | bin | 0 -> 36687 bytes | |||
-rw-r--r-- | doc/user/project/merge_requests/approvals/img/approvals_premium_mr_widget_v13_3.png | bin | 42034 -> 0 bytes | |||
-rw-r--r-- | doc/user/project/merge_requests/approvals/rules.md | 2 | ||||
-rw-r--r-- | doc/user/project/repository/branches/img/delete_merged_branches.png | bin | 42886 -> 0 bytes | |||
-rw-r--r-- | doc/user/project/repository/branches/index.md | 21 | ||||
-rw-r--r-- | doc/user/project/repository/code_suggestions.md | 14 |
8 files changed, 41 insertions, 11 deletions
diff --git a/doc/user/enterprise_user/index.md b/doc/user/enterprise_user/index.md index ffeaaa8c591..8cebdf2749d 100644 --- a/doc/user/enterprise_user/index.md +++ b/doc/user/enterprise_user/index.md @@ -43,11 +43,18 @@ Prerequisites: - A custom domain name `example.com` or subdomain `subdomain.example.com`. - Access to your domain's server control panel to set up a DNS `TXT` record to verify your domain's ownership. +- A project in the group. +- You must have the Owner role in the top-level group. Setting up a verified domain is similar to [setting up a custom domain on GitLab Pages](../project/pages/custom_domains_ssl_tls_certification/index.md). However, you must: -- Link the domain to a project. For more information on group-level domain verification, see [issue 5299](https://gitlab.com/groups/gitlab-org/-/epics/5299). -- Configure the DNS `TXT` record to verify the domain's ownership. +- Link the domain to a single project. +- Configure the `TXT` only in the DNS record to verify the domain's ownership. + +Domain verification is tied to the project you choose. A project is required because domain verification reuses the GitLab Pages verification feature, which requires a project. Domain verification applies at the top-level group and to all subgroups and projects nested under that top-level parent group. +A member in the chosen project with [at least the Maintainer role](../permissions.md#project-members-permissions) can modify or remove the domain verification. +If needed, you can create a new project to set up domain verification directly under your top-level group. This limits the ability to modify the domain verification to members with at least the Maintainer role. +For more information on group-level domain verification, see [epic 5299](https://gitlab.com/groups/gitlab-org/-/epics/5299). Steps: diff --git a/doc/user/group/manage.md b/doc/user/group/manage.md index c330e39533e..871174d3281 100644 --- a/doc/user/group/manage.md +++ b/doc/user/group/manage.md @@ -646,7 +646,7 @@ Support for group-level settings for merge request approval rules is tracked in WARNING: This feature is in [Beta](../../policy/alpha-beta-support.md#beta). Code Suggestions use generative AI to suggest code while you're developing. -Due to high demand, this feature will have unscheduled downtime and code suggestions in VS Code may be delayed. +Due to high demand, this feature may have unscheduled downtime and code suggestions in VS Code may be delayed. Code Suggestions may produce [low-quality or incomplete suggestions](../project/repository/code_suggestions.md#model-accuracy-and-quality). Beta users should read about the [known limitations](../project/repository/code_suggestions.md#known-limitations). @@ -656,6 +656,8 @@ This setting enables users in the group to access [Code Suggestions](../project/ This setting [cascades to all projects](../project/merge_requests/approvals/settings.md#settings-cascading) that belong to the group. +However, each user can enable or disable Code Suggestions for themselves. + To enable Code Suggestions for a group: 1. On the top bar, select **Main menu > Groups** and find your group. diff --git a/doc/user/project/merge_requests/approvals/img/approvals_premium_mr_widget_16_0.png b/doc/user/project/merge_requests/approvals/img/approvals_premium_mr_widget_16_0.png Binary files differnew file mode 100644 index 00000000000..727dac0916b --- /dev/null +++ b/doc/user/project/merge_requests/approvals/img/approvals_premium_mr_widget_16_0.png diff --git a/doc/user/project/merge_requests/approvals/img/approvals_premium_mr_widget_v13_3.png b/doc/user/project/merge_requests/approvals/img/approvals_premium_mr_widget_v13_3.png Binary files differdeleted file mode 100644 index 306bf57354d..00000000000 --- a/doc/user/project/merge_requests/approvals/img/approvals_premium_mr_widget_v13_3.png +++ /dev/null diff --git a/doc/user/project/merge_requests/approvals/rules.md b/doc/user/project/merge_requests/approvals/rules.md index d55ca5dff04..3a6ce48d071 100644 --- a/doc/user/project/merge_requests/approvals/rules.md +++ b/doc/user/project/merge_requests/approvals/rules.md @@ -104,7 +104,7 @@ supports multiple default rules: When an [eligible approver](#eligible-approvers) approves a merge request, it reduces the number of approvals left (the **Approvals** column) for all rules that the approver belongs to: -![Approvals premium merge request widget](img/approvals_premium_mr_widget_v13_3.png) +![Approvals premium merge request widget](img/approvals_premium_mr_widget_16_0.png) <i class="fa fa-youtube-play youtube" aria-hidden="true"></i> For an overview, see [Multiple Approvers](https://www.youtube.com/watch?v=8JQJ5821FrA). diff --git a/doc/user/project/repository/branches/img/delete_merged_branches.png b/doc/user/project/repository/branches/img/delete_merged_branches.png Binary files differdeleted file mode 100644 index 649a758b95f..00000000000 --- a/doc/user/project/repository/branches/img/delete_merged_branches.png +++ /dev/null diff --git a/doc/user/project/repository/branches/index.md b/doc/user/project/repository/branches/index.md index 7c09ce5c580..05494789b83 100644 --- a/doc/user/project/repository/branches/index.md +++ b/doc/user/project/repository/branches/index.md @@ -244,15 +244,22 @@ To compare branches in a repository: ## Delete merged branches -![Delete merged branches](img/delete_merged_branches.png) +Merged branches can be deleted in bulk if they meet all of these criteria: -This feature allows merged branches to be deleted in bulk. Only branches that -have been merged into the project's default branch and -[are not protected](../../protected_branches.md) are deleted as part of -this operation. +- They are not [protected branches](../../protected_branches.md). +- They have been merged into the project's default branch. -It's particularly useful to clean up old branches that were not deleted -automatically when a merge request was merged. +Prerequisites: + +- You must have at least the Developer role in the project. + +To do this: + +1. On the top bar, select **Main menu > Projects** and find your project. +1. On the left sidebar, select **Repository > Branches**. +1. On the upper right corner of the page, select **More** **{ellipsis_v}**. +1. Select **Delete merged branches**. +1. In the modal window, enter the word `delete` to confirm, then select **Delete merged branches**. ## Related topics diff --git a/doc/user/project/repository/code_suggestions.md b/doc/user/project/repository/code_suggestions.md index 5e79f33542a..c3d29261f07 100644 --- a/doc/user/project/repository/code_suggestions.md +++ b/doc/user/project/repository/code_suggestions.md @@ -56,11 +56,25 @@ We are making improvements to the Code Suggestions underlying AI model weekly to Usage of Code Suggestions is governed by the [GitLab Testing Agreement](https://about.gitlab.com/handbook/legal/testing-agreement/). Learn about [data usage when using Code Suggestions](#code-suggestions-data-usage). +## Enable Code Suggestions for an individual user + +> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/121079) in GitLab 16.1 as [Beta](/ee/policy/alpha-beta-support.md#beta). + +Each user can enable Code Suggestions for themselves: + +1. On the top bar, in the upper-right corner, select your avatar. +1. On the left sidebar, select **Preferences**. +1. In the **Code Suggestions** section, enable the setting. + +NOTE: +If Code Suggestions is [enabled for the group](../../group/manage.md#group-code-suggestions), the group setting overrides the user setting. + ## Enable Code Suggestions in VS Code Prerequisites: - Your group owner must enable the [group level code suggestions setting](../../group/manage.md#group-code-suggestions). +- Code Suggestions must be [enabled for your user account](#enable-code-suggestions-for-an-individual-user). - If using a [personal access token](../../profile/personal_access_tokens.md#create-a-personal-access-token), the token must have the `read_api` and `read_user` scopes. To enable Code Suggestions in VS Code: |