From c39912f5538caca913374a8983adffc234b3f1c9 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 21 Jun 2022 15:09:33 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- doc/api/graphql/reference/index.md | 5 +++-- doc/development/code_review.md | 4 +--- doc/user/group/index.md | 13 +++++++++++++ 3 files changed, 17 insertions(+), 5 deletions(-) (limited to 'doc') diff --git a/doc/api/graphql/reference/index.md b/doc/api/graphql/reference/index.md index 805f6a506b7..cc302d51e00 100644 --- a/doc/api/graphql/reference/index.md +++ b/doc/api/graphql/reference/index.md @@ -19669,8 +19669,9 @@ The status of the security scan. | Value | Description | | ----- | ----------- | -| `DIRECT` | Policies defined for the project only. | -| `INHERITED` | Policies defined for the project and project's ancestor groups. | +| `DIRECT` | Policies defined for the project/group only. | +| `INHERITED` | Policies defined for the project/group and ancestor groups. | +| `INHERITED_ONLY` | Policies defined for the project/group's ancestor groups only. | ### `SecurityReportTypeEnum` diff --git a/doc/development/code_review.md b/doc/development/code_review.md index 5e576acc15d..d864f369945 100644 --- a/doc/development/code_review.md +++ b/doc/development/code_review.md @@ -79,12 +79,10 @@ page, with these behaviors: - **Out sick** - 🌡️ `:thermometer:`, 🤒 `:face_with_thermometer:` - **At capacity** - 🔴 `:red_circle:` - **Focus mode** - 💡 `:bulb:` (focusing on their team's work) -1. [Trainee maintainers](https://about.gitlab.com/handbook/engineering/workflow/code-review/#trainee-maintainer) - are three times as likely to be picked as other reviewers. 1. Team members whose Slack or [GitLab status](../user/profile/index.md#set-your-current-status) emoji is 🔵 `:large_blue_circle:` are more likely to be picked. This applies to both reviewers and trainee maintainers. - Reviewers with 🔵 `:large_blue_circle:` are two times as likely to be picked as other reviewers. - - Trainee maintainers with 🔵 `:large_blue_circle:` are four times as likely to be picked as other reviewers. + - [Trainee maintainers](https://about.gitlab.com/handbook/engineering/workflow/code-review/#trainee-maintainer) with 🔵 `:large_blue_circle:` are three times as likely to be picked as other reviewers. 1. People whose [GitLab status](../user/profile/index.md#set-your-current-status) emoji is 🔶 `:large_orange_diamond:` or 🔸 `:small_orange_diamond:` are half as likely to be picked. 1. It always picks the same reviewers and maintainers for the same diff --git a/doc/user/group/index.md b/doc/user/group/index.md index c0ae721e3b4..18b4a7e1bcb 100644 --- a/doc/user/group/index.md +++ b/doc/user/group/index.md @@ -668,6 +668,19 @@ The most popular public email domains cannot be restricted, such as: - `hotmail.com`, `hotmail.co.uk`, `hotmail.fr` - `msn.com`, `live.com`, `outlook.com` +## Restrict Git access protocols + +> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/365601) in GitLab 15.1. + +Access to the group's repositories via SSH or HTTP(S) can be restricted to individual protocols. This setting is overridden by the instance setting configured in the GitLab Admin. + +To alter the permitted Git access protocols: + +1. Go to the group's **Settings > General** page. +1. Expand the **Permissions and group features** section. +1. Choose the allowed protocols from **Enable Git access protocols** +1. Select **Save changes** + ## Group file templates **(PREMIUM)** Use group file templates to share a set of templates for common file -- cgit v1.2.3