Merge branch 'master' into 14873-api-rails5-upgrade
authorLucas Di Pentima <ldipentima@veritasgenetics.com>
Fri, 5 Apr 2019 12:26:15 +0000 (09:26 -0300)
committerLucas Di Pentima <ldipentima@veritasgenetics.com>
Fri, 5 Apr 2019 12:26:15 +0000 (09:26 -0300)
commit248c7167e95d970b770c43102ee68cf1319973f7
tree7d6eb1c4b23c9905362444cd5f8171b7f0bc25b8
parenta7d2e8bc017ffaebd6fa7df0187ef6421f6fa9df
parent4ec3bf28abdaccca697563dac1bd126ef6df9975
Merge branch 'master' into 14873-api-rails5-upgrade

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima@veritasgenetics.com>
services/api/app/models/collection.rb
services/api/db/structure.sql
services/api/test/functional/arvados/v1/collections_controller_test.rb