Merge branch 'mmonaco/gitlab-ce-api-user-noconfirm' into 'master'

Add 'confirm' option to users api

For #1990

Based on https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/129

See merge request !1610

1 files changed, 4 insertions, 1 deletions

diff --git a/lib/api/users.rb b/lib/api/users.rb
index 37b36ddcf94..7c8b3250cd0 100644
--- a/lib/api/users.rb
+++ b/lib/api/users.rb
@@ -54,15 +54,18 @@ module API
       #   bio                               - Bio
       #   admin                             - User is admin - true or false (default)
       #   can_create_group                  - User can create groups - true or false
+      #   confirm                           - Require user confirmation - true (default) or false
       # Example Request:
       #   POST /users
       post do
         authenticated_as_admin!
         required_attributes! [:email, :password, :name, :username]
-        attrs = attributes_for_keys [:email, :name, :password, :skype, :linkedin, :twitter, :projects_limit, :username, :bio, :can_create_group, :admin]
+        attrs = attributes_for_keys [:email, :name, :password, :skype, :linkedin, :twitter, :projects_limit, :username, :bio, :can_create_group, :admin, :confirm]
         user = User.build_user(attrs)
         admin = attrs.delete(:admin)
         user.admin = admin unless admin.nil?
+        confirm = !(attrs.delete(:confirm) =~ (/(false|f|no|0)$/i))
+        user.skip_confirmation! unless confirm
 
         identity_attrs = attributes_for_keys [:provider, :extern_uid]
         if identity_attrs.any?