15531: Implement merge with redirect_to_new_user=false
authorPeter Amstutz <pamstutz@veritasgenetics.com>
Fri, 13 Sep 2019 18:09:04 +0000 (14:09 -0400)
committerPeter Amstutz <pamstutz@veritasgenetics.com>
Fri, 13 Sep 2019 18:09:04 +0000 (14:09 -0400)
commit86ca72db7b721b14b4cc658755d012dc115a5988
tree22c0f66561191df0612529d1f13e4bc3c63118a5
parent3b9310734cf6b29b35caff5dfbe64d88bc4789bf
15531: Implement merge with redirect_to_new_user=false

When false, delete credentials of old user instead of migrating them.

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz@veritasgenetics.com>
services/api/app/controllers/arvados/v1/users_controller.rb
services/api/app/models/user.rb
services/api/test/functional/arvados/v1/users_controller_test.rb