Merge branch 'master' into 15558-alternate-email-addresses
authorPeter Amstutz <pamstutz@veritasgenetics.com>
Thu, 5 Sep 2019 21:27:43 +0000 (17:27 -0400)
committerPeter Amstutz <pamstutz@veritasgenetics.com>
Thu, 5 Sep 2019 21:27:43 +0000 (17:27 -0400)
commite22d3dc998f55e3c21125b1a1be7240f89c23dd6
tree0940bbf6cbd773658a364319003b97f872384756
parent168c5a9a50b93f736b15b7a6c56af900b90aab39
parent9c656c55fe63a22b075223fe7f295e7e21e18b8c
Merge branch 'master' into 15558-alternate-email-addresses

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz@veritasgenetics.com>
services/api/app/controllers/user_sessions_controller.rb
services/api/test/integration/remote_user_test.rb