Add latest changes from gitlab-org/gitlab@master

3 files changed, 34 insertions, 11 deletions

diff --git a/doc/api/packages/composer.md b/doc/api/packages/composer.md
index b3a27519729..ea2e917bbba 100644
--- a/doc/api/packages/composer.md
+++ b/doc/api/packages/composer.md
@@ -262,6 +262,8 @@ Example response:
 
 ## Download a package archive
 
+> Authorization for this endpoint was [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/331601) in GitLab 14.10.
+
 Download a Composer package. This URL is provided in the [v1](#v1-package-metadata)
 or [v2 package metadata](#v2-package-metadata)
 response. A `.zip` file extension must be in the request.
@@ -287,3 +289,6 @@ curl --user <username>:<personal_access_token> "https://gitlab.example.com/api/v
 ```
 
 This writes the downloaded file to `package.tar.gz` in the current directory.
+
+NOTE:
+This endpoint requires authorization in GitLab 14.10 and later. In GitLab 14.9 and earlier, it was publicly accessible.
diff --git a/doc/development/code_review.md b/doc/development/code_review.md
index 5e1cd8439d4..48bbe4c60ba 100644
--- a/doc/development/code_review.md
+++ b/doc/development/code_review.md
@@ -74,17 +74,13 @@ It picks reviewers and maintainers from the list at the
 page, with these behaviors:
 
 1. It doesn't pick people whose Slack or [GitLab status](../user/profile/index.md#set-your-current-status):
-    - Contains the string 'OOO', 'PTO', 'Parental Leave', or 'Friends and Family'.
+    - Contains the string `OOO`, `PTO`, `Parental Leave`, or `Friends and Family`.
     - GitLab user **Busy** indicator is set to `True`.
-    - Emoji is any of:
-      - 🌴 `:palm_tree:`
-      - 🏖️ `:beach:`, `:beach_umbrella:`, or `:beach_with_umbrella:`
-      - 🎡 `:ferris_wheel:`
-      - 🌡️ `:thermometer:`
-      - 🤒 `:face_with_thermometer:`
-      - 🔴 `:red_circle:`
-      - 💡 `:bulb:`
-      - 🌞 `:sun_with_face:`
+    - Emoji is from one of these categories:
+      - **On leave** - 🌴 `:palm_tree:`, 🏖️ `:beach:`, ⛱ `:beach_umbrella:`, 🏖 `:beach_with_umbrella:`, 🌞 `:sun_with_face:`, 🎡 `:ferris_wheel:`
+      - **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
@@ -92,12 +88,22 @@ page, with these behaviors:
    - 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.
 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. This applies to both reviewers and trainee maintainers.
+   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
    branch name (unless their out-of-office (OOO) status changes, as in point 1). It
    removes leading `ce-` and `ee-`, and trailing `-ce` and `-ee`, so
    that it can be stable for backport branches.
 
+The [Roulette dashboard](https://gitlab-org.gitlab.io/gitlab-roulette) contains:
+
+- Assignment events in the last 7 and 30 days.
+- Currently assigned merge requests per person.
+- Sorting by different criteria.
+- A manual reviewer roulette.
+- Local time information.
+
+For more information, review [the roulette README](https://gitlab.com/gitlab-org/gitlab-roulette).
+
 ### Approval guidelines
 
 As described in the section on the responsibility of the maintainer below, you
diff --git a/doc/user/packages/composer_repository/index.md b/doc/user/packages/composer_repository/index.md
index ea12b225717..901fb740717 100644
--- a/doc/user/packages/composer_repository/index.md
+++ b/doc/user/packages/composer_repository/index.md
@@ -171,6 +171,8 @@ When you publish:
 
 ## Install a Composer package
 
+> Authorization to [download a package archive](../../../api/packages/composer.md#download-a-package-archive) was [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/331601) in GitLab 14.10.
+
 Install a package from the Package Registry so you can use it as a dependency.
 
 Prerequisites:
@@ -354,6 +356,8 @@ used to access them:
 
 ## Troubleshooting
 
+### Caching
+
 To improve performance, Composer caches files related to a package. Note that Composer doesn't remove data by
 itself. The cache grows as new packages are installed. If you encounter issues, clear the cache with
 this command:
@@ -362,6 +366,14 @@ this command:
 composer clearcache
 ```
 
+### Authorization requirement when using `composer install`
+
+In GitLab 14.9 and earlier, you did not require authorization to use `composer install` if you already had a generated `composer.lock`.
+If you committed your `composer.lock`, you could do a `composer install` in CI without setting up credentials.
+
+In GitLab 14.10 and later, authorization is required for the [downloading a package archive](../../../api/packages/composer.md#download-a-package-archive) endpoint.
+If you encounter a credentials prompt when you are using `composer install`, follow the instructions in the [install a composer package](#install-a-composer-package) section to create an `auth.json` file.
+
 ## Supported CLI commands
 
 The GitLab Composer repository supports the following Composer CLI commands: