deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

User's blocked field refactored to use state machine

Browse source
This commit is contained in:
Andrew8xx8 2013-03-04 18:52:30 +04:00
parent 9a06dd4aa1
commit 0d9a6fe7b1
12 changed files with 40 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/gitlab/auth.rb
View file

@ -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