Add latest changes from gitlab-org/gitlab@master

9 files changed, 12 insertions, 31 deletions

diff --git a/doc/ci/pipelines/cicd_minutes.md b/doc/ci/pipelines/cicd_minutes.md
index ec7d64107fd..ff30d5701cc 100644
--- a/doc/ci/pipelines/cicd_minutes.md
+++ b/doc/ci/pipelines/cicd_minutes.md
@@ -196,9 +196,9 @@ the duration of the pipeline if many jobs ran at the same time.
 The cost factor for a job running on a shared runner is:
 
 - `0.008` for public projects on GitLab SaaS, if [created 2021-07-17 or later](https://gitlab.com/gitlab-org/gitlab/-/issues/332708).
-  (For every 125 minutes of job time, you accrue 1 CD/CD minute.)
+  (For every 125 minutes of job time, you accrue 1 CI/CD minute.)
 - `0.008` for projects members of GitLab [Open Source program](../../subscriptions/index.md#gitlab-for-open-source).
-  (For every 125 minutes of job time, you accrue 1 CD/CD minute.)
+  (For every 125 minutes of job time, you accrue 1 CI/CD minute.)
 - `0` for public projects on GitLab self-managed instances, and for GitLab SaaS public projects created before 2021-07-17.
 - `1` for internal and private projects.
 
diff --git a/doc/development/testing_guide/end_to_end/feature_flags.md b/doc/development/testing_guide/end_to_end/feature_flags.md
index b1d6ef4d681..cb4c8e8a6e8 100644
--- a/doc/development/testing_guide/end_to_end/feature_flags.md
+++ b/doc/development/testing_guide/end_to_end/feature_flags.md
@@ -30,7 +30,7 @@ feature flag is under test.
 
 - Format: `feature_flag: { name: 'feature_flag_name', scope: :project }`
 - When `scope` is set to `:global`, the test will be **skipped on all live .com environments**. This is to avoid issues with feature flag changes affecting other tests or users on that environment.
-- When `scope` is set to any other value (such as `:project`, `:group` or `:user`), or if no `scope` is specified, the test will only be **skipped on canary and production**.
+- When `scope` is set to any other value (such as `:project`, `:group` or `:user`), or if no `scope` is specified, the test will only be **skipped on canary, production, and preprod**.
 This is due to the fact that administrator access is not available there.
 
 **WARNING:** You are strongly advised to first try and [enable feature flags only for a group, project, user](../../feature_flags/index.md#feature-actors),
diff --git a/doc/development/testing_guide/end_to_end/rspec_metadata_tests.md b/doc/development/testing_guide/end_to_end/rspec_metadata_tests.md
index a3f9bbb59ab..93bd3e9cb0e 100644
--- a/doc/development/testing_guide/end_to_end/rspec_metadata_tests.md
+++ b/doc/development/testing_guide/end_to_end/rspec_metadata_tests.md
@@ -15,7 +15,7 @@ This is a partial list of the [RSpec metadata](https://relishapp.com/rspec/rspec
 |-----------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | `:elasticsearch`            | The test requires an Elasticsearch service. It is used by the [instance-level scenario](https://gitlab.com/gitlab-org/gitlab-qa#definitions) [`Test::Integration::Elasticsearch`](https://gitlab.com/gitlab-org/gitlab/-/blob/72b62b51bdf513e2936301cb6c7c91ec27c35b4d/qa/qa/ee/scenario/test/integration/elasticsearch.rb) to include only tests that require Elasticsearch.                                                                                                                                |
 | `:except`                   | The test is to be run in their typical execution contexts _except_ as specified. See [test execution context selection](execution_context_selection.md) for more information.                                                                                                                                                                                                                                                                                                                                |
-| `:feature_flag`             | The test uses a feature flag and therefore requires an administrator account to run. When `scope` is set to `:global`, the test will be skipped on all live .com environments. Otherwise, it will be skipped only on Canary and Production. See [testing with feature flags](../../../development/testing_guide/end_to_end/feature_flags.md) for more details.                                                                                                                                               |
+| `:feature_flag`             | The test uses a feature flag and therefore requires an administrator account to run. When `scope` is set to `:global`, the test will be skipped on all live .com environments. Otherwise, it will be skipped only on Canary, Production, and Preprod. See [testing with feature flags](../../../development/testing_guide/end_to_end/feature_flags.md) for more details.                                                                                                                                               |
 | `:geo`                      | The test requires two GitLab Geo instances - a primary and a secondary - to be spun up.                                                                                                                                                                                                                                                                                                                                                                                                                      |
 | `:gitaly_cluster`           | The test runs against a GitLab instance where repositories are stored on redundant Gitaly nodes behind a Praefect node. All nodes are [separate containers](../../../administration/gitaly/praefect.md#requirements). Tests that use this tag have a longer setup time since there are three additional containers that need to be started.                                                                                                                                                                  |
 | `:github`                   | The test requires a GitHub personal access token.                                                                                                                                                                                                                                                                                                                                                                                                                                                            |
diff --git a/doc/user/group/saml_sso/index.md b/doc/user/group/saml_sso/index.md
index b9c4562185c..13e03ca18fa 100644
--- a/doc/user/group/saml_sso/index.md
+++ b/doc/user/group/saml_sso/index.md
@@ -462,11 +462,13 @@ Users granted:
 
 ### Automatic member removal
 
-After a group sync, users who are not members of a mapped SAML group are removed from
-the GitLab group. Even if SSO authentication is successful, if an existing user is not a member of any of the configured groups:
+After a group sync, for GitLab subgroups, users who are not members of a mapped SAML
+group are removed from the group.
 
-- They get an "unauthorized" message if they try to view the group.
-- All of their permissions to subgroups and projects are also removed.
+FLAG:
+In [GitLab 15.1 and later](https://gitlab.com/gitlab-org/gitlab/-/issues/364144), on GitLab.com, users in the top-level 
+group are assigned the [default membership role](#role) rather than removed. This setting is enabled with the 
+`saml_group_sync_retain_default_membership` feature flag and can be configured by GitLab.com administrators only.
 
 For example, in the following diagram:
 
diff --git a/doc/user/profile/account/two_factor_authentication.md b/doc/user/profile/account/two_factor_authentication.md
index f19d14fa035..a8e91d5229d 100644
--- a/doc/user/profile/account/two_factor_authentication.md
+++ b/doc/user/profile/account/two_factor_authentication.md
@@ -322,9 +322,6 @@ To disable 2FA:
 
 This clears all your 2FA registrations, including mobile applications and U2F or WebAuthn devices.
 
-Support Team support for disabling 2FA is limited, depending on your subscription level. For more information, see the
-[Account Recovery](https://about.gitlab.com/support/#account-recovery-and-2fa-resets) section of our website.
-
 ## Recovery options
 
 If you don't have access to your code generation device, you can recover access to your account:
diff --git a/doc/user/project/milestones/index.md b/doc/user/project/milestones/index.md
index 1736a6f66ea..b0f3179961d 100644
--- a/doc/user/project/milestones/index.md
+++ b/doc/user/project/milestones/index.md
@@ -116,12 +116,12 @@ From the project and group issue/merge request list pages, you can filter by bot
 From [project issue boards](../issue_board.md), you can filter by both group milestones and project
 milestones in:
 
-- [Search and filter bar](../../search/index.md#issue-boards)
+- [Search and filter bar](../issue_board.md#filter-issues)
 - [Issue board configuration](../issue_board.md#configurable-issue-boards)
 
 From [group issue boards](../issue_board.md#group-issue-boards), you can filter by only group milestones in:
 
-- [Search and filter bar](../../search/index.md#issue-boards)
+- [Search and filter bar](../issue_board.md#filter-issues)
 - [Issue board configuration](../issue_board.md#configurable-issue-boards)
 
 ### Special milestone filters
diff --git a/doc/user/search/img/multiple_assignees.png b/doc/user/search/img/multiple_assignees.png
deleted file mode 100644
index 5c46f3dda46..00000000000
--- a/doc/user/search/img/multiple_assignees.png
+++ /dev/null
diff --git a/doc/user/search/img/search_issues_board.png b/doc/user/search/img/search_issues_board.png
deleted file mode 100644
index 84048ae6a02..00000000000
--- a/doc/user/search/img/search_issues_board.png
+++ /dev/null
diff --git a/doc/user/search/index.md b/doc/user/search/index.md
index 28d4bf22689..76a85b55585 100644
--- a/doc/user/search/index.md
+++ b/doc/user/search/index.md
@@ -118,24 +118,6 @@ Individual filters can be removed by clicking on the filter's (x) button or back
 
 To delete filter tokens one at a time, the <kbd>⌥</kbd> (Mac) / <kbd>Control</kbd> + <kbd>⌫</kbd> keyboard combination can be used.
 
-## Filtering with multiple filters of the same type
-
-Some filters can be added multiple times. These include but are not limited to assignees and labels. When you filter with these multiple filters of the same type, the `AND` logic is applied. For example, if you were filtering `assignee:@sam assignee:@sarah`, your results include only entries whereby the assignees are assigned to both Sam and Sarah are returned.
-
-![multiple assignees filtering](img/multiple_assignees.png)
-
-## Issue boards
-
-From an [issue board](../../user/project/issue_board.md), you can filter issues by **Author**, **Assignee**, **Milestone**, and **Labels**.
-You can also filter them by name (issue title), from the field **Filter by name**, which is loaded as you type.
-
-To search for issues to add to lists present in your issue board, select
-the button **Add issues** on the top-right of your screen, opening a modal window from which
-you can, besides filtering them by **Name**, **Author**, **Assignee**, **Milestone**,
-and **Labels**, select multiple issues to add to a list of your choice:
-
-![search and select issues to add to board](img/search_issues_board.png)
-
 ## Autocomplete suggestions
 
 In the search bar, you can view autocomplete suggestions for: