diff options
author | Achilleas Pipinellis <axil@gitlab.com> | 2019-04-18 17:31:13 +0200 |
---|---|---|
committer | Achilleas Pipinellis <axil@gitlab.com> | 2019-05-19 13:18:10 -0700 |
commit | 70e70273e5f95a66f634b6d6060d8d0ac7dec93f (patch) | |
tree | 8cfec0ed65ec2f403fecf345bb3a03ffa41fa647 /doc/api/users.md | |
parent | 7e14fc25082a654df24e08f2fda31882eeaf386f (diff) | |
download | gitlab-ce-docs/merge-ce-ee-api.tar.gz |
Merge the EE API docs into CEdocs/merge-ce-ee-api
This is for the single docs codebase effort. For more information,
see the epic https://gitlab.com/groups/gitlab-org/-/epics/199
Diffstat (limited to 'doc/api/users.md')
-rw-r--r-- | doc/api/users.md | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/doc/api/users.md b/doc/api/users.md index d3e67d3d510..eb19c207ec1 100644 --- a/doc/api/users.md +++ b/doc/api/users.md @@ -2,6 +2,8 @@ ## List users +Active users = Total accounts - Blocked users + Get a list of users. This function takes pagination parameters `page` and `per_page` to restrict the list of users. @@ -257,7 +259,9 @@ Parameters: "can_create_project": true, "two_factor_enabled": true, "external": false, - "private_profile": false + "private_profile": false, + "shared_runners_minutes_limit": 133 + "extra_shared_runners_minutes_limit": 133 } ``` @@ -299,6 +303,8 @@ Parameters: - `external` (optional) - Flags the user as external - true or false(default) - `avatar` (optional) - Image file for user's avatar - `private_profile` (optional) - User's profile is private - true or false +- `shared_runners_minutes_limit` (optional) - Pipeline minutes quota for this user +- `extra_shared_runners_minutes_limit` (optional) - Extra pipeline minutes quota for this user ## User modification @@ -329,6 +335,8 @@ Parameters: - `can_create_group` (optional) - User can create groups - true or false - `skip_reconfirmation` (optional) - Skip reconfirmation - true or false (default) - `external` (optional) - Flags the user as external - true or false(default) +- `shared_runners_minutes_limit` (optional) - Pipeline minutes quota for this user +- `extra_shared_runners_minutes_limit` (optional) - Extra pipeline minutes quota for this user - `avatar` (optional) - Image file for user's avatar - `private_profile` (optional) - User's profile is private - true or false @@ -1150,8 +1158,6 @@ settings page. POST /users/:user_id/impersonation_tokens ``` -Parameters: - | Attribute | Type | Required | Description | | --------- | ---- | -------- | ----------- | | `user_id` | integer | yes | The ID of the user | |