diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-06-19 10:41:00 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-06-19 10:41:00 +0000 |
| commit | 2923a0c8fede436fd407b76537fee963a13ac3ea (patch) | |
| tree | fb86cda63b24e5b0c2bdeebf36986e50202e90b5 /doc | |
| parent | a4a5cbf29a983d05b5fc69f8e63fc37e100c8637 (diff) | |
| parent | 83a9a472b3bd9c9d8e64805317cd27c144b65112 (diff) | |
| download | gitlab-ce-2923a0c8fede436fd407b76537fee963a13ac3ea.tar.gz | |
Merge branch '26212-upload-user-avatar-trough-api' into 'master'
Accept image for avatar in user API
Closes #26212
See merge request !12143
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/api/users.md | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/api/users.md b/doc/api/users.md index 91ce4f6dac3..b1ebd7b0c47 100644 --- a/doc/api/users.md +++ b/doc/api/users.md @@ -251,6 +251,7 @@ Parameters: - `can_create_group` (optional) - User can create groups - true or false - `confirm` (optional) - Require confirmation - true (default) or false - `external` (optional) - Flags the user as external - true or false(default) +- `avatar` (optional) - Image file for user's avatar ## User modification @@ -279,6 +280,7 @@ Parameters: - `admin` (optional) - User is admin - true or false (default) - `can_create_group` (optional) - User can create groups - true or false - `external` (optional) - Flags the user as external - true or false(default) +- `avatar` (optional) - Image file for user's avatar 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, |