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/models/user.rb
+++ b/app/models/user.rb
@ -30,4 +30,8 @@ class User < ApplicationRecord
  def setting_boost_modal
    settings.boost_modal
  end
+
+  def setting_auto_play_gif
+    settings.auto_play_gif
+  end
 end