Add latest changes from gitlab-org/gitlab@master

6 files changed, 25 insertions, 4 deletions

diff --git a/doc/administration/environment_variables.md b/doc/administration/environment_variables.md
index 3faeea1b5c4..a453d703a18 100644
--- a/doc/administration/environment_variables.md
+++ b/doc/administration/environment_variables.md
@@ -36,6 +36,7 @@ You can use the following environment variables to override certain values:
 | `GITLAB_SHARED_RUNNERS_REGISTRATION_TOKEN` | string  | Sets the initial registration token used for runners.                                                   |
 | `RAILS_ENV`                                | string  | The Rails environment; can be one of `production`, `development`, `staging`, or `test`.                 |
 | `GITLAB_RAILS_CACHE_DEFAULT_TTL_SECONDS` | integer | The default TTL used for entries stored in the Rails-cache. Default is `28800`. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/95042) in 15.3. |
+| `GITLAB_CI_CONFIG_FETCH_TIMEOUT_SECONDS` | integer | Timeout for resolving remote includes in CI config in seconds. Must be between `0` and `60`. Default is `30`. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/116383) in 15.11. |
 
 ## Adding more variables
 
diff --git a/doc/api/dora/metrics.md b/doc/api/dora/metrics.md
index a3865213714..a1515413bed 100644
--- a/doc/api/dora/metrics.md
+++ b/doc/api/dora/metrics.md
@@ -11,6 +11,8 @@ type: reference, api
 > - The legacy key/value pair `{ "<date>" => "<value>" }` was removed from the payload in GitLab 14.0.
 > `time_to_restore_service` metric was introduced in GitLab 14.9.
 
+You can also retrieve [DORA metrics](../../user/analytics/dora_metrics.md) with the [GraphQL API](../../api/graphql/reference/index.md). 
+
 All methods require at least the Reporter role.
 
 ## Get project-level DORA metrics
diff --git a/doc/api/graphql/reference/index.md b/doc/api/graphql/reference/index.md
index 9a4df4cab04..511d6b81066 100644
--- a/doc/api/graphql/reference/index.md
+++ b/doc/api/graphql/reference/index.md
@@ -22319,6 +22319,7 @@ Check permissions for the current user on a work item.
 | <a id="workitempermissionsadminworkitem"></a>`adminWorkItem` | [`Boolean!`](#boolean) | Indicates the user can perform `admin_work_item` on this resource. |
 | <a id="workitempermissionsdeleteworkitem"></a>`deleteWorkItem` | [`Boolean!`](#boolean) | Indicates the user can perform `delete_work_item` on this resource. |
 | <a id="workitempermissionsreadworkitem"></a>`readWorkItem` | [`Boolean!`](#boolean) | Indicates the user can perform `read_work_item` on this resource. |
+| <a id="workitempermissionssetworkitemmetadata"></a>`setWorkItemMetadata` | [`Boolean!`](#boolean) | Indicates the user can perform `set_work_item_metadata` on this resource. |
 | <a id="workitempermissionsupdateworkitem"></a>`updateWorkItem` | [`Boolean!`](#boolean) | Indicates the user can perform `update_work_item` on this resource. |
 
 ### `WorkItemType`
diff --git a/doc/update/removals.md b/doc/update/removals.md
index 2dd92093d87..6874ab9fe2e 100644
--- a/doc/update/removals.md
+++ b/doc/update/removals.md
@@ -55,6 +55,22 @@ Review the details carefully before upgrading.
 
 The Live Preview feature of the Web IDE was intended to provide a client-side preview of static web applications. However, complex configuration steps and a narrow set of supported project types have limited its utility. With the introduction of the Web IDE Beta in GitLab 15.7, you can now connect to a full server-side runtime environment. With upcoming support for installing extensions in the Web IDE, we’ll also support more advanced workflows than those available with Live Preview. As of GitLab 15.9, Live Preview is no longer available in the Web IDE.
 
+### `omniauth-authentiq` gem no longer available
+
+WARNING:
+This is a [breaking change](https://docs.gitlab.com/ee/development/deprecation_guidelines/).
+Review the details carefully before upgrading.
+
+`omniauth-authentiq` is an OmniAuth strategy gem that was part of GitLab. The company providing authentication services, Authentiq, has shut down. Therefore the gem is being removed.
+
+### `omniauth-shibboleth` gem no longer available
+
+WARNING:
+This is a [breaking change](https://docs.gitlab.com/ee/development/deprecation_guidelines/).
+Review the details carefully before upgrading.
+
+`omniauth-shibboleth` is an OmniAuth strategy gem that was part of GitLab. The gem has not received security updates and does not meet GitLab quality guidance criteria. This gem was originally scheduled for removal by 14.1, but it was not removed at that time. The gem is being removed now.
+
 ## Removed in 15.8
 
 ### CiliumNetworkPolicy within the auto deploy Helm chart is removed
diff --git a/doc/user/group/saml_sso/index.md b/doc/user/group/saml_sso/index.md
index 37f1f4cc65e..a7f53dae8b6 100644
--- a/doc/user/group/saml_sso/index.md
+++ b/doc/user/group/saml_sso/index.md
@@ -480,8 +480,9 @@ An [issue exists](https://gitlab.com/gitlab-org/gitlab/-/issues/297389) to add a
 
 When the **Enforce SSO-only authentication for web activity for this group** option is enabled:
 
-- All users must access GitLab by using their GitLab group's single sign-on URL
-  to access group resources, regardless of whether they have an existing SAML
+- In alignment with the table above, all members must access GitLab by using
+  their GitLab group’s single sign-on URL to
+  access group resources, regardless of whether they have an existing SAML
   identity.
 - SSO is enforced when users access groups and projects in the organization's
   group hierarchy. Users can view other groups and projects without SSO sign in.
diff --git a/doc/user/product_analytics/index.md b/doc/user/product_analytics/index.md
index fde104200a7..6676a28dfdb 100644
--- a/doc/user/product_analytics/index.md
+++ b/doc/user/product_analytics/index.md
@@ -120,9 +120,9 @@ To view a list of product analytics dashboards for a project:
 To define a dashboard:
 
 1. In `.gitlab/product_analytics/dashboards/`, create a directory named like the dashboard. Each dashboard should have its own directory.
-1. In the new directory, create a `.yaml` file with the same name as the directory. This file contains the dashboard definition, and must conform to the JSON schema defined in `ee/app/validators/json_schemas/product_analytics_dashboard.json`.
+1. In the new directory, create a `.yaml` file with the same name as the directory. This file contains the dashboard definition, and must conform to the JSON schema defined in `ee/app/validators/json_schemas/analytics_dashboard.json`.
 1. In the `.gitlab/product_analytics/dashboards/visualizations/` directory, create a `yaml` file. This file defines the visualization type for the dashboard, and must conform to the schema in
- `ee/app/validators/json_schemas/product_analytics_visualization.json`.
+ `ee/app/validators/json_schemas/analytics_visualization.json`.
 
 The example below includes three dashboards and one visualization that applies to all dashboards.