diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-14 00:09:30 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-14 00:09:30 +0000 |
| commit | 8957ace3159e5369a700a77614493ed6a8a98f93 (patch) | |
| tree | 98ff5be0caa30cfebb4e0cd0ae2ceaf21ce92eb4 /lib/api/users.rb | |
| parent | 232e0a31f1e5d5b3a788dfc3dba8f8d41df36bf9 (diff) | |
| download | gitlab-ce-8957ace3159e5369a700a77614493ed6a8a98f93.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/api/users.rb')
| -rw-r--r-- | lib/api/users.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/api/users.rb b/lib/api/users.rb index cc13c8aab9e..1ca222b4ed5 100644 --- a/lib/api/users.rb +++ b/lib/api/users.rb @@ -52,8 +52,8 @@ module API optional :external, type: Boolean, desc: 'Flag indicating the user is an external user' # TODO: remove rubocop disable - https://gitlab.com/gitlab-org/gitlab/issues/14960 optional :avatar, type: File, desc: 'Avatar image for user' # rubocop:disable Scalability/FileUploads - optional :theme_id, type: Integer, default: 1, desc: 'The GitLab theme for the user' - optional :color_scheme_id, type: Integer, default: 1, desc: 'The color scheme for the file viewer' + optional :theme_id, type: Integer, desc: 'The GitLab theme for the user' + optional :color_scheme_id, type: Integer, desc: 'The color scheme for the file viewer' optional :private_profile, type: Boolean, desc: 'Flag indicating the user has a private profile' all_or_none_of :extern_uid, :provider |