projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5022c40 c371555)
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)
1  2 
services/api/app/models/user.rb patch | diff1 | diff2 | blob | history
services/api/test/functional/arvados/v1/users_controller_test.rb patch | diff1 | diff2 | blob | history

diff --cc services/api/app/models/user.rb
Simple merge