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

2021-04-07 16:44:06 +01:00 · 2021-04-07 16:44:06 +01:00 · 2d111c0f34
commit 2d111c0f34
parent c105164d7e 6f2e3e9508
2 changed files with 4 additions and 0 deletions
--- 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
--- 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