From 469a50879c1085ec77c95d650b7f135fee2c9e13 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 8 Jan 2021 00:32:37 +0000 Subject: Add latest changes from gitlab-org/gitlab@13-7-stable-ee --- doc/api/graphql/reference/gitlab_schema.graphql | 16 ++++-- doc/api/graphql/reference/gitlab_schema.json | 60 +++++++++------------- doc/api/graphql/reference/index.md | 10 ++-- doc/subscriptions/self_managed/index.md | 2 +- .../admin_area/settings/sign_up_restrictions.md | 29 ++++++++++- 5 files changed, 69 insertions(+), 48 deletions(-) (limited to 'doc') diff --git a/doc/api/graphql/reference/gitlab_schema.graphql b/doc/api/graphql/reference/gitlab_schema.graphql index d7ad70c808e..8218d792fe8 100644 --- a/doc/api/graphql/reference/gitlab_schema.graphql +++ b/doc/api/graphql/reference/gitlab_schema.graphql @@ -1144,6 +1144,12 @@ type BaseService implements Service { type: String } +""" +Represents non-fractional signed whole numeric values. Since the value may +exceed the size of a 32-bit integer, it's encoded as a string. +""" +scalar BigInt + type Blob implements Entry { """ Flat path of the entry @@ -3788,12 +3794,12 @@ type ContainerRepositoryTag { """ Timestamp when the tag was created. """ - createdAt: Time! + createdAt: Time """ Digest of the tag. """ - digest: String! + digest: String """ URL of the tag. @@ -3813,17 +3819,17 @@ type ContainerRepositoryTag { """ Revision of the tag. """ - revision: String! + revision: String """ Short revision of the tag. """ - shortRevision: String! + shortRevision: String """ The size of the tag. """ - totalSize: Int! + totalSize: BigInt } """ diff --git a/doc/api/graphql/reference/gitlab_schema.json b/doc/api/graphql/reference/gitlab_schema.json index 4adb92d351e..3494e0c8300 100644 --- a/doc/api/graphql/reference/gitlab_schema.json +++ b/doc/api/graphql/reference/gitlab_schema.json @@ -2999,6 +2999,16 @@ "enumValues": null, "possibleTypes": null }, + { + "kind": "SCALAR", + "name": "BigInt", + "description": "Represents non-fractional signed whole numeric values. Since the value may exceed the size of a 32-bit integer, it's encoded as a string.", + "fields": null, + "inputFields": null, + "interfaces": null, + "enumValues": null, + "possibleTypes": null + }, { "kind": "OBJECT", "name": "Blob", @@ -10347,13 +10357,9 @@ ], "type": { - "kind": "NON_NULL", - "name": null, - "ofType": { - "kind": "SCALAR", - "name": "Time", - "ofType": null - } + "kind": "SCALAR", + "name": "Time", + "ofType": null }, "isDeprecated": false, "deprecationReason": null @@ -10365,13 +10371,9 @@ ], "type": { - "kind": "NON_NULL", - "name": null, - "ofType": { - "kind": "SCALAR", - "name": "String", - "ofType": null - } + "kind": "SCALAR", + "name": "String", + "ofType": null }, "isDeprecated": false, "deprecationReason": null @@ -10437,13 +10439,9 @@ ], "type": { - "kind": "NON_NULL", - "name": null, - "ofType": { - "kind": "SCALAR", - "name": "String", - "ofType": null - } + "kind": "SCALAR", + "name": "String", + "ofType": null }, "isDeprecated": false, "deprecationReason": null @@ -10455,13 +10453,9 @@ ], "type": { - "kind": "NON_NULL", - "name": null, - "ofType": { - "kind": "SCALAR", - "name": "String", - "ofType": null - } + "kind": "SCALAR", + "name": "String", + "ofType": null }, "isDeprecated": false, "deprecationReason": null @@ -10473,13 +10467,9 @@ ], "type": { - "kind": "NON_NULL", - "name": null, - "ofType": { - "kind": "SCALAR", - "name": "Int", - "ofType": null - } + "kind": "SCALAR", + "name": "BigInt", + "ofType": null }, "isDeprecated": false, "deprecationReason": null diff --git a/doc/api/graphql/reference/index.md b/doc/api/graphql/reference/index.md index 2842f7893bf..4cb79d71ab5 100644 --- a/doc/api/graphql/reference/index.md +++ b/doc/api/graphql/reference/index.md @@ -632,14 +632,14 @@ A tag from a container repository. | Field | Type | Description | | ----- | ---- | ----------- | | `canDelete` | Boolean! | Can the current user delete this tag. | -| `createdAt` | Time! | Timestamp when the tag was created. | -| `digest` | String! | Digest of the tag. | +| `createdAt` | Time | Timestamp when the tag was created. | +| `digest` | String | Digest of the tag. | | `location` | String! | URL of the tag. | | `name` | String! | Name of the tag. | | `path` | String! | Path of the tag. | -| `revision` | String! | Revision of the tag. | -| `shortRevision` | String! | Short revision of the tag. | -| `totalSize` | Int! | The size of the tag. | +| `revision` | String | Revision of the tag. | +| `shortRevision` | String | Short revision of the tag. | +| `totalSize` | BigInt | The size of the tag. | ### CreateAlertIssuePayload diff --git a/doc/subscriptions/self_managed/index.md b/doc/subscriptions/self_managed/index.md index a4affff92e4..301d78b708a 100644 --- a/doc/subscriptions/self_managed/index.md +++ b/doc/subscriptions/self_managed/index.md @@ -59,7 +59,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 the [User cap](../../user/admin_area/settings/sign_up_restrictions.md#user-cap) - option. **Available in GitLab 13.6 and later**. + option. **Available in GitLab 13.7 and later**. - [Disable new sign-ups](../../user/admin_area/settings/sign_up_restrictions.md), and instead manage new users manually. - View a breakdown of users by role in the [Users statistics](../../user/admin_area/index.md#users-statistics) page. diff --git a/doc/user/admin_area/settings/sign_up_restrictions.md b/doc/user/admin_area/settings/sign_up_restrictions.md index 213c8c4116a..ddd3dbda9cc 100644 --- a/doc/user/admin_area/settings/sign_up_restrictions.md +++ b/doc/user/admin_area/settings/sign_up_restrictions.md @@ -37,6 +37,9 @@ To require administrator approval for new sign ups: 1. Go to **Admin Area > Settings > General** and expand **Sign-up restrictions**. 1. Select the **Require admin approval for new sign-ups** checkbox, then select **Save changes**. +In [GitLab 13.7 and later](https://gitlab.com/gitlab-org/gitlab/-/issues/273258), if an administrator disables this setting, the users in pending approval state are +automatically approved in a background job. + ## Require email confirmation You can send confirmation emails during sign up and require that users confirm @@ -49,15 +52,37 @@ To enforce confirmation of the email address used for new sign ups: ## User cap **(CORE ONLY)** -> [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/4315) in GitLab 13.6. +> - [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/4315) in GitLab 13.7. +> - It's [deployed behind a feature flag](../../feature_flags.md), enabled by default. +> - It's recommended for production use. +> - For GitLab self-managed instances, GitLab administrators can opt to [disable it](#enable-or-disable-user-cap). **(CORE ONLY)** When the number of billable users reaches the user cap, any user who is added or requests access must be [approved](../approving_users.md#approving-a-user) by an administrator before they can start using their account. -If an administrator increases or removes the user cap, the users in pending approval state will be +If an administrator increases or removes the user cap, the users in pending approval state are automatically approved in a background job. +### Enable or disable User cap **(CORE ONLY)** + +User cap is 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) +can opt to disable it. + +To disable it: + +```ruby +Feature.disable(:admin_new_user_signups_cap) +``` + +To enable it: + +```ruby +Feature.enable(:admin_new_user_signups_cap) +``` + ## Soft email confirmation > - [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/issues/47003) in GitLab 12.2. -- cgit v1.2.3