Merge branch 'pause-gif' of git://github.com/patf/mastodon into patf-pause-gif

2017-04-18 01:25:50 +02:00
parent 16d50f60d1 ffb99325ca
commit 57d784f1e4
12 changed files with 65 additions and 28 deletions
--- a/app/views/home/initial_state.json.rabl
+++ b/app/views/home/initial_state.json.rabl
@@ -9,6 +9,7 @@ node(:meta) do
    me: current_account.id,
    admin: @admin.try(:id),
    boost_modal: current_account.user.setting_boost_modal,
+    auto_play_gif: current_account.user.setting_auto_play_gif,
  }
 end