diff options
Diffstat (limited to 'doc/subscriptions')
| -rw-r--r-- | doc/subscriptions/bronze_starter.md | 18 | ||||
| -rw-r--r-- | doc/subscriptions/gitlab_com/index.md | 4 | ||||
| -rw-r--r-- | doc/subscriptions/self_managed/index.md | 11 |
3 files changed, 16 insertions, 17 deletions
diff --git a/doc/subscriptions/bronze_starter.md b/doc/subscriptions/bronze_starter.md index bb2a2303d29..78a9e324ada 100644 --- a/doc/subscriptions/bronze_starter.md +++ b/doc/subscriptions/bronze_starter.md @@ -50,15 +50,15 @@ the tiers are no longer mentioned in GitLab documentation: - [Group management through LDAP](../administration/auth/ldap/ldap-troubleshooting.md#group-memberships) - Syncing information through LDAP: - Groups: [one group](../administration/auth/ldap/ldap-troubleshooting.md#sync-one-group), - [all groups programmatically](../administration/auth/ldap/index.md#group-sync), - [group sync schedule](../administration/auth/ldap/index.md#adjust-ldap-group-sync-schedule), and + [all groups programmatically](../administration/auth/ldap/ldap_synchronization.md#group-sync), + [group sync schedule](../administration/auth/ldap/ldap_synchronization.md#adjust-ldap-group-sync-schedule), and [all groups manually](../administration/auth/ldap/ldap-troubleshooting.md#sync-all-groups) - [Configuration settings](../administration/auth/ldap/index.md#ldap-sync-configuration-settings) - - Users: [all users](../administration/auth/ldap/index.md#user-sync), - [administrators](../administration/auth/ldap/index.md#administrator-sync), - [user sync schedule](../administration/auth/ldap/index.md#adjust-ldap-user-sync-schedule) - - [Adding group links](../administration/auth/ldap/index.md#add-group-links) - - [Lock memberships to LDAP synchronization](../administration/auth/ldap/index.md#global-group-memberships-lock) + - Users: [all users](../administration/auth/ldap/ldap_synchronization.md#user-sync), + [administrators](../administration/auth/ldap/ldap_synchronization.md#administrator-sync), + [user sync schedule](../administration/auth/ldap/ldap_synchronization.md#adjust-ldap-user-sync-schedule) + - [Adding group links](../administration/auth/ldap/ldap_synchronization.md#add-group-links) + - [Lock memberships to LDAP synchronization](../administration/auth/ldap/ldap_synchronization.md#global-group-memberships-lock) - Rake tasks for [LDAP tasks](../administration/raketasks/ldap.md), including [syncing groups](../administration/raketasks/ldap.md#run-a-group-sync) - Logging: @@ -92,11 +92,11 @@ the tiers are no longer mentioned in GitLab documentation: - [Pull mirroring](../user/project/repository/mirror/pull.md) outside repositories in a GitLab repository - [Overwrite diverged branches](../user/project/repository/mirror/pull.md#overwrite-diverged-branches) - [Trigger pipelines for mirror updates](../user/project/repository/mirror/pull.md#trigger-pipelines-for-mirror-updates) - - [Hard failures](../user/project/repository/mirror/pull.md#hard-failure) when mirroring fails + - [Fix hard failures when mirroring](../user/project/repository/mirror/pull.md#fix-hard-failures-when-mirroring) - [Trigger pull mirroring from the API](../user/project/repository/mirror/pull.md#trigger-an-update-by-using-the-api) - [Mirror only protected branches](../user/project/repository/mirror/index.md#mirror-only-protected-branches) - [Bidirectional mirroring](../user/project/repository/mirror/bidirectional.md) - - [Mirror with Perforce Helix via Git Fusion](../user/project/repository/mirror/bidirectional.md#mirror-with-perforce-helix-via-git-fusion) + - [Mirror with Perforce Helix with Git Fusion](../user/project/repository/mirror/bidirectional.md#mirror-with-perforce-helix-with-git-fusion) - Runners: - Run pipelines in the parent project [for merge requests from a forked project](../ci/pipelines/merge_request_pipelines.md#run-pipelines-in-the-parent-project-for-merge-requests-from-a-forked-project) - [Shared runners pipeline minutes quota](../user/admin_area/settings/continuous_integration.md#shared-runners-pipeline-minutes-quota) diff --git a/doc/subscriptions/gitlab_com/index.md b/doc/subscriptions/gitlab_com/index.md index a8e02251b64..a26feb6d97e 100644 --- a/doc/subscriptions/gitlab_com/index.md +++ b/doc/subscriptions/gitlab_com/index.md @@ -311,8 +311,8 @@ Your own runners can still be used even if you reach your limits. If you're using GitLab SaaS, you can purchase additional CI minutes so your pipelines aren't blocked after you have used all your CI minutes from your -main quota. You can find pricing for additional CI/CD minutes in the -[GitLab Customers Portal](https://customers.gitlab.com/plans). Additional minutes: +main quota. You can find pricing for additional CI/CD minutes on the +[GitLab Pricing page](https://about.gitlab.com/pricing/). Additional minutes: - Are only used after the shared quota included in your subscription runs out. - Roll over month to month. diff --git a/doc/subscriptions/self_managed/index.md b/doc/subscriptions/self_managed/index.md index acdbdefc671..aee18e3d763 100644 --- a/doc/subscriptions/self_managed/index.md +++ b/doc/subscriptions/self_managed/index.md @@ -108,7 +108,7 @@ GitLab has several features which can help you manage the number of users: - Enable the [**Require administrator approval for new sign ups**](../../user/admin_area/settings/sign_up_restrictions.md#require-administrator-approval-for-new-sign-ups) option. -- Enable `block_auto_created_users` for new sign-ups via [LDAP](../../administration/auth/ldap/index.md#basic-configuration-settings) or [OmniAuth](../../integration/omniauth.md#initial-omniauth-configuration). +- Enable `block_auto_created_users` for new sign-ups via [LDAP](../../administration/auth/ldap/index.md#basic-configuration-settings) or [OmniAuth](../../integration/omniauth.md#configure-initial-settings). - Enable the [User cap](../../user/admin_area/settings/sign_up_restrictions.md#user-cap) option. **Available in GitLab 13.7 and later**. - [Disable new sign-ups](../../user/admin_area/settings/sign_up_restrictions.md), and instead manage new @@ -181,9 +181,9 @@ The daily job provides **only** the following information to the Customers Porta - Instance ID - MD5 hash of license -<details> -<summary>Click here to view an example of a cloud licensing sync request.</summary> -<pre><code> +Example of a cloud licensing sync request: + +```json { "gitlab_version": "14.1.0-pre", "timestamp": "2021-06-14T12:00:09Z", @@ -231,8 +231,7 @@ The daily job provides **only** the following information to the Customers Porta "instance_id": "9367590b-82ad-48cb-9da7-938134c29088", "license_md5": "002f02470fe45ef6a333a4282aca6222" } -</code></pre> -</details> +``` #### Sync subscription details |