projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 4904-arv-web
[arvados.git]
/
services
/
api
/
app
/
controllers
/
arvados
/
v1
/
groups_controller.rb
diff --git
a/services/api/app/controllers/arvados/v1/groups_controller.rb
b/services/api/app/controllers/arvados/v1/groups_controller.rb
index b88f254c46a029716d60fefa4d74bb9e6f92085d..c82ffb49cd7af8e4b7fe2afac128474718de71c8 100644
(file)
--- a/
services/api/app/controllers/arvados/v1/groups_controller.rb
+++ b/
services/api/app/controllers/arvados/v1/groups_controller.rb
@@
-57,7
+57,7
@@
class Arvados::V1::GroupsController < ApplicationController
:items_available => @items_available,
:items => @objects.as_api_response(nil)
}
:items_available => @items_available,
:items => @objects.as_api_response(nil)
}
-
render json:
@object_list
+
send_json
@object_list
end
protected
end
protected