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

Merge branch 'master' into 'master'
d41b2085 · Dmitriy Zaporozhets · ee7364a6 · fda55f91 · d41b2085
Commit d41b2085 authored Mar 26, 2015 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

users.rb lib/api/users.rb +2 -2

No files found.
--- a/lib/api/users.rb
+++ b/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]