diff options
| author | Gabriel Mazetto <gabriel@gitlab.com> | 2016-01-14 03:31:27 -0200 |
|---|---|---|
| committer | Gabriel Mazetto <gabriel@gitlab.com> | 2016-01-14 03:31:27 -0200 |
| commit | dd6fc01ff8a073880b67a323a547edeb5d63f167 (patch) | |
| tree | 6d6140793653da8699a038cf538e4fe763143649 /app/models/user.rb | |
| parent | fc7e6e8ffcb76e92b625b6490a966c830adc750a (diff) | |
| download | gitlab-ce-feature/ldap-sync-edgecases.tar.gz | |
fixed LDAP activation on login to use new ldap_blocked statefeature/ldap-sync-edgecases
Diffstat (limited to 'app/models/user.rb')
| -rw-r--r-- | app/models/user.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 5eed9cf91c7..592468933ed 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -205,6 +205,7 @@ class User < ActiveRecord::Base event :activate do transition blocked: :active + transition ldap_blocked: :active end state :blocked, :ldap_blocked do |