From 24d67ec55454fc6f4e8e80bf7c8dc5bc677e8514 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 1 Jul 2022 18:08:33 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- doc/development/integrations/index.md | 1 + doc/development/licensed_feature_availability.md | 10 ++++++++++ doc/integration/oauth_provider.md | 9 ++------- doc/user/admin_area/monitoring/background_migrations.md | 3 +++ doc/user/analytics/value_stream_analytics.md | 2 +- doc/user/group/value_stream_analytics/index.md | 2 +- 6 files changed, 18 insertions(+), 9 deletions(-) (limited to 'doc') diff --git a/doc/development/integrations/index.md b/doc/development/integrations/index.md index 604e481a809..5d1bd5ad61c 100644 --- a/doc/development/integrations/index.md +++ b/doc/development/integrations/index.md @@ -148,6 +148,7 @@ This method should return an array of hashes for each field, where the keys can | `title:` | string | false | Capitalized value of `name:` | The label for the form field. | `placeholder:` | string | false | | A placeholder for the form field. | `help:` | string | false | | A help text that displays below the form field. +| `api_only:` | boolean | false | `false` | Specify if the field should only be available through the API, and excluded from the frontend form. #### Additional keys for `type: 'checkbox'` diff --git a/doc/development/licensed_feature_availability.md b/doc/development/licensed_feature_availability.md index 09c32fc4244..da5e25b0ec0 100644 --- a/doc/development/licensed_feature_availability.md +++ b/doc/development/licensed_feature_availability.md @@ -61,3 +61,13 @@ before_action do push_licensed_feature(:feature_symbol, project) end ``` + +## Allow use of licensed EE features + +To enable plans per namespace turn on the `Allow use of licensed EE features` option from the settings page. +This will make licensed EE features available to projects only if the project namespace's plan includes the feature +or if the project is public. To enable it: + +1. If you are developing locally, follow the steps in [simulate SaaS](ee_features.md#act-as-saas) to make the option available. +1. Visit Admin > Settings > General > "Account and limit" and +enabling "Allow use of licensed EE features". diff --git a/doc/integration/oauth_provider.md b/doc/integration/oauth_provider.md index e33f874d35a..4031f3a52e7 100644 --- a/doc/integration/oauth_provider.md +++ b/doc/integration/oauth_provider.md @@ -86,7 +86,7 @@ To create an application for your GitLab instance: When creating application in the **Admin Area** , you can mark it as _trusted_. The user authorization step is automatically skipped for this application. -## Expiring access tokens +## Access token expiration > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/21745) in GitLab 14.3, with the ability to opt out. > - Ability to opt-out of expiring access token [removed](https://gitlab.com/gitlab-org/gitlab/-/issues/340848) in GitLab 15.0. @@ -97,12 +97,7 @@ in GitLab 14.3 and [removed](https://gitlab.com/gitlab-org/gitlab/-/issues/34084 existing integrations must be updated to support access token refresh. Access tokens expire in two hours which means that integrations that use them must support generating new access -tokens at least every two hours. Existing: - -- Applications can have expiring access tokens: - 1. Edit the application. - 1. Select **Expire access tokens**. -- Tokens must be [revoked](../api/oauth2.md#revoke-a-token) or they don't expire. +tokens at least every two hours. When applications are deleted, all grants and tokens associated with the application are also deleted. diff --git a/doc/user/admin_area/monitoring/background_migrations.md b/doc/user/admin_area/monitoring/background_migrations.md index 53d5056bb65..02d32099c63 100644 --- a/doc/user/admin_area/monitoring/background_migrations.md +++ b/doc/user/admin_area/monitoring/background_migrations.md @@ -28,6 +28,9 @@ You can [check the status of existing migrations](../../../update/index.md#batch ## Enable or disable batched background migrations +WARNING: +If you disable this feature flag, GitLab upgrades may fail. + Batched background migrations are under development but ready for production use. It is deployed behind a feature flag that is **enabled by default**. [GitLab administrators with access to the GitLab Rails console](../../../administration/feature_flags.md) diff --git a/doc/user/analytics/value_stream_analytics.md b/doc/user/analytics/value_stream_analytics.md index c0f97369740..a71136628cf 100644 --- a/doc/user/analytics/value_stream_analytics.md +++ b/doc/user/analytics/value_stream_analytics.md @@ -34,7 +34,7 @@ To view value stream analytics for your project: 1. On the top bar, select **Menu > Projects** and find your project. 1. On the left sidebar, select **Analytics > Value stream**. -1. To view metrics for each stage, above the **Filter results** text box, select a stage. +1. To view metrics for a particular stage, select a stage below the **Filter results** text box. 1. Optional. Filter the results: 1. Select the **Filter results** text box. 1. Select a parameter. diff --git a/doc/user/group/value_stream_analytics/index.md b/doc/user/group/value_stream_analytics/index.md index 960552cc10f..f024ccb7528 100644 --- a/doc/user/group/value_stream_analytics/index.md +++ b/doc/user/group/value_stream_analytics/index.md @@ -37,7 +37,7 @@ To view value stream analytics for your group: 1. On the top bar, select **Menu > Groups** and find your group. 1. On the left sidebar, select **Analytics > Value stream**. -1. To view metrics for each stage, above the **Filter results** text box, select a stage. +1. To view metrics for a particular stage, select a stage below the **Filter results** text box. 1. Optional. Filter the results: 1. Select the **Filter results** text box. 1. Select a parameter. -- cgit v1.2.3