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

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

diff --git a/app/views/api/users/show.json.jbuilder b/app/views/api/users/show.json.jbuilder
index 51a85380ca97cf641280c3e515bcba0eca46e23d..b3a86a8926129e9c8f53c2ad83d77c5fdf752de8 100644 (file)
--- a/app/views/api/users/show.json.jbuilder
+++ b/app/views/api/users/show.json.jbuilder
@@ -1 +1,3 @@
+json.partial! "api/root_attributes"
+
 json.partial! @user