diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-03-14 01:25:47 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-03-14 01:25:47 +0300 |
| commit | afb694886eccc1bad6abd900bede8699f2a10dff (patch) | |
| tree | d4c6210da5b900297c2c5630cf80ce22f2924292 /lib | |
| parent | 4803675190833cdf7e83558a32b2f2ea3283dce0 (diff) | |
| parent | 8fed435208fed3115c740eb630c263a97b5a631d (diff) | |
Merge branch 'ldap-unblock-user' into 'master'
Unblock user if they were unblocked in AD.
Fixes problem with !1687.
See merge request !1694
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 |