diff options
| author | Michael Leopard <mleopard@gitlab.com> | 2019-06-19 20:27:34 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-06-19 20:27:34 +0000 |
| commit | 8cf85b4bb50d0b116cb50699831f3ec049ae4ad4 (patch) | |
| tree | 9dc2a9627e70860ed4ffd8ec938f58d4c48ad15f /doc/api/users.md | |
| parent | 4a5bda06900b2b623f7f9fcdce6b36cdcf73bc51 (diff) | |
| download | gitlab-ce-8cf85b4bb50d0b116cb50699831f3ec049ae4ad4.tar.gz | |
Updating CE repo to include new EE users API changes
Updated users API documentation
Moved API level changes to the service level
Diffstat (limited to 'doc/api/users.md')
| -rw-r--r-- | doc/api/users.md | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/doc/api/users.md b/doc/api/users.md index 47028c679b8..4bc0335ae33 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,8 @@ Parameters: "two_factor_enabled": true, "external": false, "private_profile": false, - "highest_role":10 + "shared_runners_minutes_limit": 133 + "extra_shared_runners_minutes_limit": 133 } ``` @@ -290,6 +293,7 @@ Parameters: - `projects_limit` (optional) - Number of projects user can create - `extern_uid` (optional) - External UID - `provider` (optional) - External provider name +- `group_id_for_saml` (optional) - ID of group where SAML has been configured - `bio` (optional) - User's biography - `location` (optional) - User's location - `public_email` (optional) - The public email of the user @@ -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 @@ -322,6 +328,7 @@ Parameters: - `projects_limit` - Limit projects each user can create - `extern_uid` - External UID - `provider` - External provider name +- `group_id_for_saml` (optional) - ID of group where SAML has been configured - `bio` - User's biography - `location` (optional) - User's location - `public_email` (optional) - The public email of the user @@ -329,6 +336,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 +1159,6 @@ settings page. POST /users/:user_id/impersonation_tokens ``` -Parameters: - | Attribute | Type | Required | Description | | --------- | ---- | -------- | ----------- | | `user_id` | integer | yes | The ID of the user | @@ -1255,4 +1262,4 @@ Example response: Please note that `last_activity_at` is deprecated, please use `last_activity_on`. -[gemojione-index]: https://github.com/jonathanwiesel/gemojione/blob/master/config/index.json +[gemojione-index]: https://github.com/jonathanwiesel/gemojione/blob/master/config/index.json
\ No newline at end of file |