Add latest changes from gitlab-org/gitlab@master

5 files changed, 28 insertions, 12 deletions

diff --git a/doc/api/todos.md b/doc/api/todos.md
index 2fd120f9cbb..2bfae1972b7 100644
--- a/doc/api/todos.md
+++ b/doc/api/todos.md
@@ -20,14 +20,14 @@ GET /todos
 
 Parameters:
 
-| Attribute | Type | Required | Description                                                                                                                                                               |
-| --------- | ---- | -------- |---------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| Attribute | Type | Required | Description                                                                                                                                                                                        |
+| --------- | ---- | -------- |----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | `action` | string | no | The action to be filtered. Can be `assigned`, `mentioned`, `build_failed`, `marked`, `approval_required`, `unmergeable`, `directly_addressed`, `merge_train_removed` or `member_access_requested`. |
-| `author_id` | integer | no | The ID of an author                                                                                                                                                       |
-| `project_id` | integer | no | The ID of a project                                                                                                                                                       |
-| `group_id` | integer | no | The ID of a group                                                                                                                                                         |
-| `state` | string | no | The state of the to-do item. Can be either `pending` or `done`                                                                                                            |
-| `type` | string | no | The type of to-do item. Can be either `Issue`, `MergeRequest`, `Commit`, `Epic`, `DesignManagement::Design` or `AlertManagement::Alert`                                   |
+| `author_id` | integer | no | The ID of an author                                                                                                                                                                                |
+| `project_id` | integer | no | The ID of a project                                                                                                                                                                                |
+| `group_id` | integer | no | The ID of a group                                                                                                                                                                                  |
+| `state` | string | no | The state of the to-do item. Can be either `pending` or `done`                                                                                                                                     |
+| `type` | string | no | The type of to-do item. Can be either `Issue`, `MergeRequest`, `Commit`, `Epic`, `DesignManagement::Design`, `AlertManagement::Alert` or `Namespace`                                               |
 
 ```shell
 curl --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/todos"
diff --git a/doc/development/code_review.md b/doc/development/code_review.md
index e2340e39903..30d9d671038 100644
--- a/doc/development/code_review.md
+++ b/doc/development/code_review.md
@@ -124,6 +124,8 @@ page, with these behaviors:
   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.
+- People whose Slack or [GitLab status](../user/profile/index.md#set-your-current-status) emoji
+  is Ⓜ `:m:`are only suggested as reviewers on projects they are a maintainer of.
 
 The [Roulette dashboard](https://gitlab-org.gitlab.io/gitlab-roulette/) contains:
 
diff --git a/doc/development/gemfile.md b/doc/development/gemfile.md
index 562b4e10570..36ef1bcd834 100644
--- a/doc/development/gemfile.md
+++ b/doc/development/gemfile.md
@@ -47,7 +47,8 @@ This needs to be done for any new, or updated gems.
 
 We do not allow gems that are fetched from Git repositories. All gems have
 to be available in the RubyGems index. We want to minimize external build
-dependencies and build times.
+dependencies and build times. It's enforced by the RuboCop rule
+[`Cop/GemFetcher`](https://gitlab.com/gitlab-org/ruby/gems/gitlab-styles/-/blob/master/lib/rubocop/cop/gem_fetcher.rb).
 
 ## Review the new dependency for quality
 
diff --git a/doc/development/service_ping/metrics_dictionary.md b/doc/development/service_ping/metrics_dictionary.md
index 25895d732e4..49f8a5ac465 100644
--- a/doc/development/service_ping/metrics_dictionary.md
+++ b/doc/development/service_ping/metrics_dictionary.md
@@ -122,10 +122,21 @@ which has a related schema in `/config/metrics/objects_schemas/topology_schema.j
 
 ### Metric `time_frame`
 
-- `7d`: The metric data applies to the most recent 7-day interval. For example, the following metric counts the number of users that create epics over a 7-day interval: `ee/config/metrics/counts_7d/20210305145820_g_product_planning_epic_created_weekly.yml`.
-- `28d`: The metric data applies to the most recent 28-day interval. For example, the following metric counts the number of unique users that create issues over a 28-day interval: `config/metrics/counts_28d/20210216181139_issues.yml`.
-- `all`: The metric data applies for the whole time the metric has been active (all-time interval). For example, the following metric counts all users that create issues: `/config/metrics/counts_all/20210216181115_issues.yml`.
-- `none`: The metric collects a type of data that's not tracked over time, such as settings and configuration information. Therefore, a time interval is not applicable. For example, `uuid` has no time interval applicable: `config/metrics/license/20210201124933_uuid.yml`.
+A metric's time frame is calculated based on the `time_frame` field and the `data_source` of the metric.
+For `redis_hll` metrics, the type of aggregation is also taken into consideration. In this context, the term "aggregation" refers to [chosen events data storage interval](implement.md#add-new-events), and is **NOT** related to the Aggregated Metrics feature.
+For more information about the aggregation type of each feature, see the [`common.yml` file](https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/usage_data_counters/known_events/common.yml). Weeks run from Monday to Sunday.
+
+| data_source            | time_frame | aggregation    | Description                                     | 
+|------------------------|------------|----------------|-------------------------------------------------|
+| any                    | `none`     | not applicable | A type of data that’s not tracked over time, such as settings and configuration information |
+| `database`             | `all`      | not applicable | The whole time the metric has been active (all-time interval) |
+| `database`             | `7d`       | not applicable | 9 days ago to 2 days ago |
+| `database`             | `28d`      | not applicable | 30 days ago to 2 days ago |
+| `redis`                | `all`      | not applicable | The whole time the metric has been active (all-time interval) |
+| `redis_hll`            | `7d`       | `daily`        | Most recent 7 complete days |
+| `redis_hll`            | `7d`       | `weekly`       | Most recent complete week |
+| `redis_hll`            | `28d`      | `daily`        | Most recent 28 complete days |
+| `redis_hll`            | `28d`      | `weekly`       | Most recent 4 complete weeks |
 
 ### Data category
 
diff --git a/doc/user/project/import/github.md b/doc/user/project/import/github.md
index 275343f584d..07a21d8b941 100644
--- a/doc/user/project/import/github.md
+++ b/doc/user/project/import/github.md
@@ -61,6 +61,8 @@ GitLab.
 For this association to succeed, each GitHub author and assignee in the repository
 must have a [public-facing email address](https://docs.github.com/en/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-email-preferences/setting-your-commit-email-address)
 on GitHub that matches their GitLab email address (regardless of how the account was created).
+If their email address from GitHub is set as their secondary email address in GitLab, it must be
+confirmed.
 
 GitLab content imports that use GitHub accounts require that the GitHub public-facing email address is populated. This means
 all comments and contributions are properly mapped to the same user in GitLab. GitHub Enterprise does not require this