Skip to content

G
gitlab-ce
Commit a698488c authored by GitLab Bot's avatar GitLab Bot
Browse files
Options

Automatic merge of gitlab-org/gitlab master

parents cf300aef 6c3d2d1f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 114 additions and 153 deletions
doc/api/graphql/removed_items.md
View file @ a698488c
...@@ -41,8 +41,8 @@ Fields removed in [GitLab 14.0](https://gitlab.com/gitlab-org/gitlab/-/merge_req ...@@ -41,8 +41,8 @@ Fields removed in [GitLab 14.0](https://gitlab.com/gitlab-org/gitlab/-/merge_req
Fields removed in [GitLab 13.6](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/44866): Fields removed in [GitLab 13.6](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/44866):
| Field name | GraphQL type | Deprecated in | Use instead | | Field name | GraphQL type | Deprecated in | Use instead |
| -------------------- | -------------------- | ------------- | -------------------------- | |----------------------|--------------------------|---------------|----------------------------|
| `date` | `Timelog` **(STARTER)** | 12.10 | `spentAt` | | `date` | `Timelog` | 12.10 | `spentAt` |
| `designs` | `Issue`, `EpicIssue` | 12.2 | `designCollection` | | `designs` | `Issue`, `EpicIssue` | 12.2 | `designCollection` |
| `latestPipeline` | `Commit` | 12.5 | `pipelines` | | `latestPipeline` | `Commit` | 12.5 | `pipelines` |
| `mergeCommitMessage` | `MergeRequest` | 11.8 | `latestMergeCommitMessage` | | `mergeCommitMessage` | `MergeRequest` | 11.8 | `latestMergeCommitMessage` |
......
doc/api/users.md
View file @ a698488c
...@@ -434,7 +434,7 @@ Parameters: ...@@ -434,7 +434,7 @@ Parameters:
| `email` | Yes | Email | | `email` | Yes | Email |
| `extern_uid` | No | External UID | | `extern_uid` | No | External UID |
| `external` | No | Flags the user as external - true or false (default) | | `external` | No | Flags the user as external - true or false (default) |
| `extra_shared_runners_minutes_limit` | No | Extra pipeline minutes quota for this user (purchased in addition to the minutes included in the plan) **(STARTER)** | | `extra_shared_runners_minutes_limit` | No | Extra pipeline minutes quota for this user (purchased in addition to the minutes included in the plan) **(PREMIUM)** |
| `force_random_password` | No | Set user password to a random value - true or false (default) | | `force_random_password` | No | Set user password to a random value - true or false (default) |
| `group_id_for_saml` | No | ID of group where SAML has been configured | | `group_id_for_saml` | No | ID of group where SAML has been configured |
| `linkedin` | No | LinkedIn | | `linkedin` | No | LinkedIn |
...@@ -447,7 +447,7 @@ Parameters: ...@@ -447,7 +447,7 @@ Parameters:
| `projects_limit` | No | Number of projects user can create | | `projects_limit` | No | Number of projects user can create |
| `provider` | No | External provider name | | `provider` | No | External provider name |
| `reset_password` | No | Send user password reset link - true or false(default) | | `reset_password` | No | Send user password reset link - true or false(default) |
| `shared_runners_minutes_limit` | No | Pipeline minutes quota for this user (included in plan). Can be `nil` (default; inherit system default), `0` (unlimited) or `> 0` **(STARTER)** | | `shared_runners_minutes_limit` | No | Pipeline minutes quota for this user (included in plan). Can be `nil` (default; inherit system default), `0` (unlimited) or `> 0` **(PREMIUM)** |
| `skip_confirmation` | No | Skip confirmation - true or false (default) | | `skip_confirmation` | No | Skip confirmation - true or false (default) |
| `skype` | No | Skype ID | | `skype` | No | Skype ID |
| `theme_id` | No | The GitLab theme for the user (see [the user preference docs](../user/profile/preferences.md#navigation-theme) for more information) | | `theme_id` | No | The GitLab theme for the user (see [the user preference docs](../user/profile/preferences.md#navigation-theme) for more information) |
...@@ -476,7 +476,7 @@ Parameters: ...@@ -476,7 +476,7 @@ Parameters:
| `email` | No | Email | | `email` | No | Email |
| `extern_uid` | No | External UID | | `extern_uid` | No | External UID |
| `external` | No | Flags the user as external - true or false (default) | | `external` | No | Flags the user as external - true or false (default) |
| `extra_shared_runners_minutes_limit` | No | Extra pipeline minutes quota for this user (purchased in addition to the minutes included in the plan) **(STARTER)** | | `extra_shared_runners_minutes_limit` | No | Extra pipeline minutes quota for this user (purchased in addition to the minutes included in the plan) **(PREMIUM)** |
| `group_id_for_saml` | No | ID of group where SAML has been configured | | `group_id_for_saml` | No | ID of group where SAML has been configured |
| `id` | Yes | The ID of the user | | `id` | Yes | The ID of the user |
| `linkedin` | No | LinkedIn | | `linkedin` | No | LinkedIn |
...@@ -489,7 +489,7 @@ Parameters: ...@@ -489,7 +489,7 @@ Parameters:
| `projects_limit` | No | Limit projects each user can create | | `projects_limit` | No | Limit projects each user can create |
| `provider` | No | External provider name | | `provider` | No | External provider name |
| `public_email` | No | The public email of the user (must be already verified) | | `public_email` | No | The public email of the user (must be already verified) |
| `shared_runners_minutes_limit` | No | Pipeline minutes quota for this user (included in plan). Can be `nil` (default; inherit system default), `0` (unlimited) or `> 0` **(STARTER)** | | `shared_runners_minutes_limit` | No | Pipeline minutes quota for this user (included in plan). Can be `nil` (default; inherit system default), `0` (unlimited) or `> 0` **(PREMIUM)** |
| `skip_reconfirmation` | No | Skip reconfirmation - true or false (default) | | `skip_reconfirmation` | No | Skip reconfirmation - true or false (default) |
| `skype` | No | Skype ID | | `skype` | No | Skype ID |
| `theme_id` | No | The GitLab theme for the user (see [the user preference docs](../user/profile/preferences.md#navigation-theme) for more information) | | `theme_id` | No | The GitLab theme for the user (see [the user preference docs](../user/profile/preferences.md#navigation-theme) for more information) |
......
doc/raketasks/backup_restore.md
View file @ a698488c
...@@ -1481,7 +1481,7 @@ If this happens, examine the following: ...@@ -1481,7 +1481,7 @@ If this happens, examine the following:
> - For GitLab self-managed instances, GitLab administrators can opt to [disable it](#disable-or-enable-gitaly-backup). > - For GitLab self-managed instances, GitLab administrators can opt to [disable it](#disable-or-enable-gitaly-backup).
There can be There can be
[risks when disabling released features](../user/feature_flags.md#risks-when-disabling-released-features). [risks when disabling released features](../administration/feature_flags.md#risks-when-disabling-released-features).
Refer to this feature's version history for more details. Refer to this feature's version history for more details.
`gitaly-backup` is used by the backup Rake task to create and restore repository backups from Gitaly. `gitaly-backup` is used by the backup Rake task to create and restore repository backups from Gitaly.
......
doc/user/admin_area/settings/help_page.md
View file @ a698488c
...@@ -67,7 +67,7 @@ You can specify a custom URL to which users are directed when they: ...@@ -67,7 +67,7 @@ You can specify a custom URL to which users are directed when they:
> - To use in GitLab self-managed instances, ask a GitLab administrator to [enable it](#enable-or-disable-gitlab-documentation-link-redirects). **(FREE SELF)** > - To use in GitLab self-managed instances, ask a GitLab administrator to [enable it](#enable-or-disable-gitlab-documentation-link-redirects). **(FREE SELF)**
This in-development feature might not be available for your use. There can be This in-development feature might not be available for your use. There can be
[risks when enabling features still in development](../../feature_flags.md#risks-when-enabling-features-still-in-development). [risks when enabling features still in development](../../../administration/feature_flags.md#risks-when-enabling-features-still-in-development).
Refer to this feature's version history for more details. Refer to this feature's version history for more details.
Documentation links go to the `/help` section on the instance by default, but you can Documentation links go to the `/help` section on the instance by default, but you can
......
doc/user/project/code_owners.md
View file @ a698488c
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7