From a89cb5cbdd832d4d9e80517973aceda6bc0a3856 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 6 Feb 2020 21:08:48 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- lib/api/users.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/api/users.rb') diff --git a/lib/api/users.rb b/lib/api/users.rb index eba7c50435c..da64ff7e306 100644 --- a/lib/api/users.rb +++ b/lib/api/users.rb @@ -52,7 +52,7 @@ 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 :private_profile, type: Boolean, default: false, desc: 'Flag indicating the user has a private profile' + optional :private_profile, type: Boolean, desc: 'Flag indicating the user has a private profile' all_or_none_of :extern_uid, :provider use :optional_params_ee -- cgit v1.2.3