git.arvados.org - arvados.git/commit

author	Tom Clegg <tom@curoverse.com>
	Thu, 8 Jun 2017 18:21:21 +0000 (14:21 -0400)
committer	radhika <radhika@curoverse.com>
	Thu, 8 Jun 2017 19:34:08 +0000 (15:34 -0400)
commit	b7a20a386bb6bf582c4bc92d8718b883417d4c48
tree	c817cc40dfe415d0736aac7c1da6e6eee31d6f81	tree \| snapshot
parent	aa12c56d26cb72824ddd2399e17e846cd9d9b483	commit \| diff

11837: Fix "include_trash" scope and test case.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curoverse.com>

apps/workbench/test/controllers/trash_items_controller_test.rb	[deleted file]	blob \| history
services/api/app/controllers/arvados/v1/collections_controller.rb		diff \| blob \| history
services/api/app/models/arvados_model.rb		diff \| blob \| history
services/api/test/functional/arvados/v1/collections_controller_test.rb		diff \| blob \| history