From 0d9a6fe7b16e52cc4d5595d6b26552c39911cf07 Mon Sep 17 00:00:00 2001 From: Andrew8xx8 Date: Mon, 4 Mar 2013 18:52:30 +0400 Subject: User's blocked field refactored to use state machine --- lib/api/entities.rb | 4 ++-- lib/gitlab/auth.rb | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'lib') 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 -- cgit v1.2.1