git.arvados.org - arvados.git/commit

Merge branch '2640-folder-api'

refs #2640

Conflicts:
services/api/app/controllers/application_controller.rb
services/api/config/routes.rb

apps/workbench/test/unit/user_test.rb	diff1 \|	diff2 \|	blob \| history
services/api/app/controllers/application_controller.rb	diff1 \|	diff2 \|	blob \| history
services/api/config/routes.rb	diff1 \|	diff2 \|	blob \| history
services/api/test/functional/arvados/v1/users_controller_test.rb	diff1 \|	diff2 \|	blob \| history
services/api/test/integration/collections_api_test.rb	diff1 \|	diff2 \|	blob \| history
services/api/test/integration/errors_test.rb	diff1 \|	\|	blob \| history