Merge branch 'master' into 'master'

Change ordering so that confirm is removed from attrs before attempting to User.build_user

Possible fix gitlab-org/gitlab-ce#1296

See merge request !445

lib/api/users.rb

@@ -61,10 +61,10 @@ module API
         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, :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 = User.build_user(attrs)
+        user.admin = admin unless admin.nil?
         user.skip_confirmation! unless confirm
 
         identity_attrs = attributes_for_keys [:provider, :extern_uid]