diff options
author | Daniel Juarez <daniel.juarez.gonzalez@cern.ch> | 2017-11-21 15:47:58 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2017-11-21 15:47:58 +0000 |
commit | 0b9e1e16626eff4cd8ae43ce47ec0f965beaf843 (patch) | |
tree | 4171348087b509348c59bb7d35f55fe6f5972f81 /lib/api/users.rb | |
parent | 28a5f5f2e91297a56369c39e96be25187ad0a1dd (diff) | |
download | gitlab-ce-0b9e1e16626eff4cd8ae43ce47ec0f965beaf843.tar.gz |
Skip confirmation user api
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 d80b364bd09..0cd89b1bcf8 100644 --- a/lib/api/users.rb +++ b/lib/api/users.rb @@ -31,7 +31,6 @@ module API optional :location, type: String, desc: 'The location of the user' 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 :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 @@ -101,6 +100,7 @@ module API requires :email, type: String, desc: 'The email of the user' optional :password, type: String, desc: 'The password of the new user' optional :reset_password, type: Boolean, desc: 'Flag indicating the user will be sent a password reset token' + optional :skip_confirmation, type: Boolean, desc: 'Flag indicating the account is confirmed' at_least_one_of :password, :reset_password requires :name, type: String, desc: 'The name of the user' requires :username, type: String, desc: 'The username of the user' @@ -134,6 +134,7 @@ module API requires :id, type: Integer, desc: 'The ID of the user' optional :email, type: String, desc: 'The email of the user' optional :password, type: String, desc: 'The password of the new user' + optional :skip_reconfirmation, type: Boolean, desc: 'Flag indicating the account skips the confirmation by email' optional :name, type: String, desc: 'The name of the user' optional :username, type: String, desc: 'The username of the user' use :optional_attributes |