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

State machine 3

2 files changed, 6 insertions, 4 deletions

diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 1cae1d337fe..088c9959804 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -2,11 +2,11 @@ module Gitlab
   module Entities
     class User < Grape::Entity
       expose :id, :username, :email, :name, :bio, :skype, :linkedin, :twitter,
-             :dark_scheme, :theme_id, :blocked, :created_at, :extern_uid, :provider
+             :dark_scheme, :theme_id, :state, :created_at, :extern_uid, :provider
     end
 
     class UserBasic < Grape::Entity
-      expose :id, :username, :email, :name, :blocked, :created_at
+      expose :id, :username, :email, :name, :state, :created_at
     end
 
     class UserLogin < UserBasic
diff --git a/lib/gitlab/auth.rb b/lib/gitlab/auth.rb
index d0e792befbb..0fee33dbeb0 100644
--- 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)
+      @user.save!
+
       if Gitlab.config.omniauth['block_auto_created_users'] && !ldap
-        @user.blocked = true
+        @user.block
       end
-      @user.save!
+
       @user
     end