diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-03-13 22:25:47 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-03-13 22:25:47 +0000 |
| commit | afb694886eccc1bad6abd900bede8699f2a10dff (patch) | |
| tree | d4c6210da5b900297c2c5630cf80ce22f2924292 /app/controllers/snippets_controller.rb | |
| parent | 4803675190833cdf7e83558a32b2f2ea3283dce0 (diff) | |
| parent | 8fed435208fed3115c740eb630c263a97b5a631d (diff) | |
| download | gitlab-ce-afb694886eccc1bad6abd900bede8699f2a10dff.tar.gz | |
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 'app/controllers/snippets_controller.rb')
0 files changed, 0 insertions, 0 deletions