git.arvados.org - arvados.git/commit

projects / arvados.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 72912c6 5debe2b)

author	Lucas Di Pentima <lucas@curoverse.com>
	Tue, 22 Nov 2016 16:40:45 +0000 (13:40 -0300)
committer	Lucas Di Pentima <lucas@curoverse.com>
	Tue, 22 Nov 2016 16:40:45 +0000 (13:40 -0300)
commit	09a2e88c51e5432e607f2a38466e55b4ba15e887
tree	f7f39c3f127fc9f139c1ae4cd9c679cbfc31107e	tree \| snapshot
parent	72912c6b25fcb10c0acc540daf4f8a25d802784b	commit \| diff
parent	5debe2b77df18d381d7d59976e76f4ea6c9d5ce0	commit \| diff

5737: Merge branch 'master' into 5737-ruby231

12 files changed:

apps/workbench/app/controllers/application_controller.rb	diff1 \|	diff2 \|	blob \| history
build/run-tests.sh	diff1 \|	diff2 \|	blob \| history
services/api/Gemfile	diff1 \|	diff2 \|	blob \| history
services/api/Gemfile.lock	diff1 \|	diff2 \|	blob \| history
services/api/app/controllers/application_controller.rb	diff1 \|	diff2 \|	blob \| history
services/api/app/models/arvados_model.rb	diff1 \|	diff2 \|	blob \| history
services/api/app/models/collection.rb	diff1 \|	diff2 \|	blob \| history
services/api/app/models/log.rb	diff1 \|	diff2 \|	blob \| history
services/api/app/models/node.rb	diff1 \|	diff2 \|	blob \| history
services/api/app/models/user.rb	diff1 \|	diff2 \|	blob \| history
services/api/test/functional/arvados/v1/collections_controller_test.rb	diff1 \|	diff2 \|	blob \| history
services/api/test/functional/arvados/v1/jobs_controller_test.rb	diff1 \|	diff2 \|	blob \| history