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/settings/preferences/show.html.haml
+++ b/app/views/settings/preferences/show.html.haml
@ -25,5 +25,8 @@
  .fields-group
    = f.input :setting_boost_modal, as: :boolean, wrapper: :with_label

+  .fields-group
+    = f.input :setting_auto_play_gif, as: :boolean, wrapper: :with_label
+
  .actions
    = f.button :button, t('generic.save_changes'), type: :submit