From: Tom Hughes Date: Wed, 7 Apr 2021 15:44:06 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/pull/3166' X-Git-Tag: live~1702 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/2d111c0f34613779bb730f1d0a823fa48e9d8439?hp=c105164d7e652dec72a4bff0a47ef96540a6f5ba 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 efc905cfe..1ad07d47c 100644 --- 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 51a85380c..b3a86a892 100644 --- 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