diff options
| author | Rémy Coutable <remy@rymai.me> | 2019-09-10 16:24:12 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2019-09-10 16:24:12 +0000 |
| commit | 0498ec89a1b44caad91603215d1ea96aaa4e1eb8 (patch) | |
| tree | ad30eb329787116653940d22a95cad1e99ebb0ab /lib/api/users.rb | |
| parent | 0078ea44c292cd0e5eb7f4ae52358087c8ee34db (diff) | |
| parent | daf7810e2ee323e39e3cc0b1c6f3fe15a9977a14 (diff) | |
| download | gitlab-ce-60549-environment-fetch.tar.gz | |
Merge branch 'ac-cop-scalability-api-files' into 'master'60549-environment-fetch
Add Scalability/FileUploads cop
Closes gitlab-ee#14925
See merge request gitlab-org/gitlab-ce!32864
Diffstat (limited to 'lib/api/users.rb')
| -rw-r--r-- | lib/api/users.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/api/users.rb b/lib/api/users.rb index a4ac5b629b8..99295888c8c 100644 --- a/lib/api/users.rb +++ b/lib/api/users.rb @@ -50,7 +50,8 @@ module API optional :admin, type: Boolean, desc: 'Flag indicating the user is an administrator' optional :can_create_group, type: Boolean, desc: 'Flag indicating the user can create groups' optional :external, type: Boolean, desc: 'Flag indicating the user is an external user' - optional :avatar, type: File, desc: 'Avatar image for user' + # TODO: remove rubocop disable - https://gitlab.com/gitlab-org/gitlab-ee/issues/14960 + optional :avatar, type: File, desc: 'Avatar image for user' # rubocop:disable Scalability/FileUploads optional :private_profile, type: Boolean, default: false, desc: 'Flag indicating the user has a private profile' all_or_none_of :extern_uid, :provider |