Merge remote-tracking branch 'upstream/master' into gs-master

2017-10-16 09:23:59 -05:00
parent 6cd5b3bbe5 aec70b44fc
commit dbb1fce94d
67 changed files with 1520 additions and 787 deletions
--- a/app/serializers/initial_state_serializer.rb
+++ b/app/serializers/initial_state_serializer.rb
@ -25,6 +25,7 @@ class InitialStateSerializer < ActiveModel::Serializer
      store[:boost_modal]    = object.current_account.user.setting_boost_modal
      store[:delete_modal]   = object.current_account.user.setting_delete_modal
      store[:auto_play_gif]  = object.current_account.user.setting_auto_play_gif
+      store[:reduce_motion]  = object.current_account.user.setting_reduce_motion
    end

    store