Merge remote-tracking branch 'upstream/pull/3166'
This commit is contained in:
commit
2d111c0f34
2 changed files with 4 additions and 0 deletions
|
@ -1,3 +1,5 @@
|
||||||
|
json.partial! "api/root_attributes"
|
||||||
|
|
||||||
json.users(@users) do |user|
|
json.users(@users) do |user|
|
||||||
json.partial! user
|
json.partial! user
|
||||||
end
|
end
|
||||||
|
|
|
@ -1 +1,3 @@
|
||||||
|
json.partial! "api/root_attributes"
|
||||||
|
|
||||||
json.partial! @user
|
json.partial! @user
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue