Skip to content

G
gitlab-ce
Commit 6c3d2d1f authored by Amy Qualls's avatar Amy Qualls
Browse files
Options

Merge branch 'docs-users-api-starter' into 'master' 

Remove Starter tier refs from Users API page

See merge request gitlab-org/gitlab!67264
parents 340fb8bf 6d9bfbe8
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
doc/api/users.md
View file @ 6c3d2d1f
...@@ -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) |
......
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