Merge branch 'master' of https://github.com/blackle/mastodon into blackle-master

2017-04-11 20:43:56 +02:00
parent b723ee73fc 06444bf050
commit 2a7602cad4
16 changed files with 144 additions and 18 deletions
--- a/app/models/user.rb
+++ b/app/models/user.rb
@ -26,4 +26,8 @@ class User < ApplicationRecord
  def setting_default_privacy
    settings.default_privacy || (account.locked? ? 'private' : 'public')
  end
+
+  def setting_boost_modal
+    settings.boost_modal
+  end
 end