summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-06-19 10:41:00 +0000
committerRémy Coutable <remy@rymai.me>2017-06-19 10:41:00 +0000
commit2923a0c8fede436fd407b76537fee963a13ac3ea (patch)
treefb86cda63b24e5b0c2bdeebf36986e50202e90b5 /lib
parenta4a5cbf29a983d05b5fc69f8e63fc37e100c8637 (diff)
parent83a9a472b3bd9c9d8e64805317cd27c144b65112 (diff)
downloadgitlab-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 'lib')
-rw-r--r--lib/api/users.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/api/users.rb b/lib/api/users.rb
index dda64715ee1..7257ecb5b67 100644
--- a/lib/api/users.rb
+++ b/lib/api/users.rb
@@ -29,6 +29,7 @@ module API
optional :can_create_group, type: Boolean, desc: 'Flag indicating the user can create groups'
optional :skip_confirmation, type: Boolean, default: false, desc: 'Flag indicating the account is confirmed'
optional :external, type: Boolean, desc: 'Flag indicating the user is an external user'
+ optional :avatar, type: File, desc: 'Avatar image for user'
all_or_none_of :extern_uid, :provider
end
end