summaryrefslogtreecommitdiff
path: root/spec/controllers/profiles/avatars_controller_spec.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-05-12 13:28:33 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-05-12 13:28:33 +0000
commit8b9e3af8bf7a6089a11ef3f5eb91dfef4940a3f4 (patch)
tree8d7ee3bb08376dcfcbbdb38a886720af47224522 /spec/controllers/profiles/avatars_controller_spec.rb
parent0bac9d0135a7b925382e9beb2968059978a284af (diff)
parent125cb9b866b66a4ae21a3fec8ae5ad6e1b3ae4ec (diff)
downloadgitlab-ce-8b9e3af8bf7a6089a11ef3f5eb91dfef4940a3f4.tar.gz
Merge branch 'ad-block_auto_created_users' into 'master'
Don't accidentally unblock auto created users from Active Directory. Fixes #1581. See merge request !638
Diffstat (limited to 'spec/controllers/profiles/avatars_controller_spec.rb')
0 files changed, 0 insertions, 0 deletions