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/views/settings/preferences/show.html.haml
+++ b/app/views/settings/preferences/show.html.haml
@ -35,6 +35,7 @@

  .fields-group
    = f.input :setting_auto_play_gif, as: :boolean, wrapper: :with_label
+    = f.input :setting_reduce_motion, as: :boolean, wrapper: :with_label
    = f.input :setting_system_font_ui, as: :boolean, wrapper: :with_label

  .actions