summaryrefslogtreecommitdiff
path: root/lib/api/api.rb
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2015-07-03 13:46:29 +0000
committerStan Hu <stanhu@gmail.com>2015-07-03 13:46:29 +0000
commit50a04bdc28f8037131e7571370e87cf758181663 (patch)
treecc9f635e07f0ad0b74ae1d5b45b14f1eeebed236 /lib/api/api.rb
parent49749169e9b442c13cdc279d7e783f65a3afc794 (diff)
parentb3a751112ded889769dadc7cc69d2d1467aa9471 (diff)
downloadgitlab-ce-50a04bdc28f8037131e7571370e87cf758181663.tar.gz
Merge branch 'api-user-blocking' into 'master'
Allow user to be blocked and activated via the API When authenticating against LDAP if a user has been disabled in LDAP they can no longer log on to the website or commit over http(s) but will be able to commit using any ssh keys. This functionality allows us to look for users in GitLab that no longer exist in LDAP and disable then in GitLab. Closes Feedback item: [Add administrative API call to block users](http://feedback.gitlab.com/forums/176466-general/suggestions/4098632-add-administrative-api-call-to-block-users) See merge request !587
Diffstat (limited to 'lib/api/api.rb')
0 files changed, 0 insertions, 0 deletions