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

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

diff --git a/app/views/api/user_preferences/index.json.jbuilder b/app/views/api/user_preferences/index.json.jbuilder
index b3255562f6f15d16e6cb30340d788679e1c519c7..f4f0d284f7184075cd8ffb59ee2ed64c27894e66 100644 (file)
--- a/app/views/api/user_preferences/index.json.jbuilder
+++ b/app/views/api/user_preferences/index.json.jbuilder
@@ -1 +1,3 @@
-json.partial! @user_preferences
+json.partial! "api/root_attributes"
+
+json.preferences(@user_preferences.to_h { |pref| [pref.k, pref.v] })