diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-10-01 15:13:08 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-10-01 15:13:08 +0000 |
| commit | 051090c804a4808cd43a2e5494fe7cb868314765 (patch) | |
| tree | 61a38fab494aa9c56c09f24e907bc843d16a7bc4 /doc/api/users.md | |
| parent | bfeed3b304aa6719b8f823de23f0cbe9712ba7de (diff) | |
| parent | 303350567c7b2bf140fa17d3f3f473ad9ece4e45 (diff) | |
| download | gitlab-ce-051090c804a4808cd43a2e5494fe7cb868314765.tar.gz | |
Merge branch 'feature/set-public-email-through-api' into 'master'
Set public email through api
Closes #37675
See merge request gitlab-org/gitlab-ce!21938
Diffstat (limited to 'doc/api/users.md')
| -rw-r--r-- | doc/api/users.md | 40 |
1 files changed, 21 insertions, 19 deletions
diff --git a/doc/api/users.md b/doc/api/users.md index 762ea53edee..3b41e0f7ec6 100644 --- a/doc/api/users.md +++ b/doc/api/users.md @@ -288,6 +288,7 @@ Parameters: - `provider` (optional) - External provider name - `bio` (optional) - User's biography - `location` (optional) - User's location +- `public_email` (optional) - The public email of the user - `admin` (optional) - User is admin - true or false (default) - `can_create_group` (optional) - User can create groups - true or false - `skip_confirmation` (optional) - Skip confirmation - true or false (default) @@ -305,26 +306,27 @@ PUT /users/:id Parameters: -- `email` - Email -- `username` - Username -- `name` - Name -- `password` - Password -- `skype` - Skype ID -- `linkedin` - LinkedIn -- `twitter` - Twitter account -- `website_url` - Website URL -- `organization` - Organization name -- `projects_limit` - Limit projects each user can create -- `extern_uid` - External UID -- `provider` - External provider name -- `bio` - User's biography -- `location` (optional) - User's location -- `admin` (optional) - User is admin - true or false (default) -- `can_create_group` (optional) - User can create groups - true or false +- `email` - Email +- `username` - Username +- `name` - Name +- `password` - Password +- `skype` - Skype ID +- `linkedin` - LinkedIn +- `twitter` - Twitter account +- `website_url` - Website URL +- `organization` - Organization name +- `projects_limit` - Limit projects each user can create +- `extern_uid` - External UID +- `provider` - External provider name +- `bio` - User's biography +- `location` (optional) - User's location +- `public_email` (optional) - The public email of the user +- `admin` (optional) - User is admin - true or false (default) +- `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) -- `avatar` (optional) - Image file for user's avatar -- `private_profile` (optional) - User's profile is private - true or false +- `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 On password update, user will be forced to change it upon next login. Note, at the moment this method does only return a `404` error, |