Merge remote-tracking branch 'upstream/pull/5434'

[rails.git] / app / views / api / users / index.json.jbuilder

diff --git a/app/views/api/users/index.json.jbuilder b/app/views/api/users/index.json.jbuilder
index 1ad07d47cd2639cc63d49ae093b9785478a5868b..d2dbd4d4f5c6113fd03a381e779215dabe3e58c4 100644 (file)
--- a/app/views/api/users/index.json.jbuilder
+++ b/app/views/api/users/index.json.jbuilder
@@ -1,5 +1,5 @@
 json.partial! "api/root_attributes"
 
-json.users(@users) do |user|
-  json.partial! user
+json.users do
+  json.array! @users, :partial => "user", :as => :user
 end