15061: Implement admin variant of user merge by uuid
authorPeter Amstutz <pamstutz@veritasgenetics.com>
Tue, 7 May 2019 22:00:57 +0000 (18:00 -0400)
committerPeter Amstutz <pamstutz@veritasgenetics.com>
Thu, 9 May 2019 19:29:28 +0000 (15:29 -0400)
commit6731fb679926da11149c5c287072a6c139046f10
treebe6a3735ccef40fab61d509833cd34b708f59bf5
parentce6416c4bfaf33ac17815f070ae5693fe1b7f1ae
15061: Implement admin variant of user merge by uuid

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