diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-03-13 16:40:15 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-03-13 22:34:11 +0100 |
| commit | 8fed435208fed3115c740eb630c263a97b5a631d (patch) | |
| tree | b19988b7d9590761f8398c6c1b027b69395bb3fb /lib | |
| parent | 606d24ff2df157ec70003132d1ead7a47dc32883 (diff) | |
| download | gitlab-ce-8fed435208fed3115c740eb630c263a97b5a631d.tar.gz | |
Unblock user if they were unblocked in AD.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/ldap/access.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/gitlab/ldap/access.rb b/lib/gitlab/ldap/access.rb index 6e30724e1f7..960fb3849b4 100644 --- a/lib/gitlab/ldap/access.rb +++ b/lib/gitlab/ldap/access.rb @@ -40,6 +40,7 @@ module Gitlab user.block unless user.blocked? false else + user.activate if user.blocked? true end else |