Merge pull request #3143 from Undev/state-machine-3

State machine 3
2013-03-05 05:38:16 -08:00 · 2013-03-05 05:38:16 -08:00 · f22488f726
commit f22488f726
parent f9200e118c c6d6bd6ab4
15 changed files with 68 additions and 33 deletions
--- a/lib/gitlab/auth.rb
+++ b/lib/gitlab/auth.rb
@ -41,10 +41,12 @@ module Gitlab
        password_confirmation: password,
        projects_limit: Gitlab.config.gitlab.default_projects_limit,
      }, as: :admin)
-      if Gitlab.config.omniauth['block_auto_created_users'] && !ldap
-        @user.blocked = true
-      end
      @user.save!
+
+      if Gitlab.config.omniauth['block_auto_created_users'] && !ldap
+        @user.block
+      end
+
      @user
    end