diff options
| author | Gabriel Mazetto <gabriel@gitlab.com> | 2016-01-12 12:29:10 -0200 |
|---|---|---|
| committer | Gabriel Mazetto <gabriel@gitlab.com> | 2016-01-12 12:29:10 -0200 |
| commit | ac6a10f3e88c5d2081b8638df63016089517a844 (patch) | |
| tree | e39451ddb02f6689d0f9d77b8d08d2d91abd3c71 /lib/api/users.rb | |
| parent | 47e4613f4adc2d6ef4b066a87ec772ef8044bdd5 (diff) | |
| download | gitlab-ce-ac6a10f3e88c5d2081b8638df63016089517a844.tar.gz | |
Codestyle changes
Diffstat (limited to 'lib/api/users.rb')
| -rw-r--r-- | lib/api/users.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/api/users.rb b/lib/api/users.rb index 01fd90139b0..fd2128bd179 100644 --- a/lib/api/users.rb +++ b/lib/api/users.rb @@ -303,10 +303,10 @@ module API if !user not_found!('User') - elsif !user.ldap_blocked? - user.activate - else + elsif user.ldap_blocked? forbidden!('LDAP blocked users cannot be unblocked by the API') + else + user.activate end end end |