Merge branch 'master' into 14946-ruby-2.5
authorLucas Di Pentima <ldipentima@veritasgenetics.com>
Mon, 10 Jun 2019 17:45:54 +0000 (14:45 -0300)
committerLucas Di Pentima <ldipentima@veritasgenetics.com>
Mon, 10 Jun 2019 17:45:54 +0000 (14:45 -0300)
commite838828374ceed5ef6da260939251e86f72b6f27
tree66e07c14c3944d8c9689ca78af0fb6fe519be5c2
parentebce50053f2f560591bef4ca3552f9d43a4bdfd4
parenta061ac1788c67e7f0107a80c63005af328306afa
Merge branch 'master' into 14946-ruby-2.5

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima@veritasgenetics.com>
build/run-tests.sh
services/api/app/controllers/application_controller.rb