From: Lucas Di Pentima Date: Mon, 12 Oct 2020 20:18:51 +0000 (-0300) Subject: 16718: Merge branch 'master' into 16718-group-contents-collection-versions X-Git-Tag: 2.2.0~254^2~2 X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/c0cbdeb1567d4a4f190a01d3fe89aa975e51e47b 16718: Merge branch 'master' into 16718-group-contents-collection-versions Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima --- c0cbdeb1567d4a4f190a01d3fe89aa975e51e47b diff --cc services/api/app/controllers/arvados/v1/groups_controller.rb index 56ad2026bf,3e238a5ada..812929d500 --- a/services/api/app/controllers/arvados/v1/groups_controller.rb +++ b/services/api/app/controllers/arvados/v1/groups_controller.rb @@@ -32,16 -32,13 +32,16 @@@ class Arvados::V1::GroupsController < A params = _index_requires_parameters. merge({ uuid: { - type: 'string', required: false, default: nil + type: 'string', required: false, default: nil, }, recursive: { - type: 'boolean', required: false, description: 'Include contents from child groups recursively.' + type: 'boolean', required: false, default: false, description: 'Include contents from child groups recursively.', }, include: { - type: 'string', required: false, description: 'Include objects referred to by listed field in "included" (only owner_uuid).' - type: 'string', required: false, description: 'Include objects referred to by listed field in "included" (only owner_uuid)', ++ type: 'string', required: false, description: 'Include objects referred to by listed field in "included" (only owner_uuid).', + }, + include_old_versions: { - type: 'boolean', required: false, description: 'Include past collection versions.' ++ type: 'boolean', required: false, default: false, description: 'Include past collection versions.', } }) params.delete(:select)