Merge branch 'master' into 15803-unsetup
authorPeter Amstutz <pamstutz@veritasgenetics.com>
Mon, 25 Nov 2019 22:37:25 +0000 (17:37 -0500)
committerPeter Amstutz <pamstutz@veritasgenetics.com>
Mon, 25 Nov 2019 22:37:25 +0000 (17:37 -0500)
commit14a6eb786a0d01e86ccae7645e880661caf6f0cb
tree8c85216a588c79c033b8092c4d4a4e201c65d3e1
parent5022c4068227e4d354389169a9abd726206aff7d
parentc371555926e3f361497b2bb1c9531fcaf7283ed4
Merge branch 'master' into 15803-unsetup
services/api/app/models/user.rb
services/api/test/functional/arvados/v1/users_controller_test.rb