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/models/user.rb
+++ b/app/models/user.rb
@ -102,6 +102,10 @@ class User < ApplicationRecord
    settings.auto_play_gif
  end

+  def setting_reduce_motion
+    settings.reduce_motion
+  end
+
  def setting_system_font_ui
    settings.system_font_ui
  end