about summary refs log tree commit diff
path: root/app/models/user.rb
diff options
context:
space:
mode:
authorOndřej Hruška <ondra@ondrovo.com>2017-07-18 18:58:47 +0200
committerOndřej Hruška <ondra@ondrovo.com>2017-07-18 18:58:47 +0200
commitd69fa9e1f40124279ec9d772e5f54d1e11724e2d (patch)
treeef0462e5fcc8cc7962ef42d80f7dd520a574a7c5 /app/models/user.rb
parentc727eae4412ac9e4f1bafdc68fe89dcd46d602ca (diff)
parent0b4006fc47dcd3d57ffdd0b95c95ad4c40a4918f (diff)
Merge changes from upstream with the CSS reload fix
Diffstat (limited to 'app/models/user.rb')
-rw-r--r--app/models/user.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/models/user.rb b/app/models/user.rb
index becf0018f..25dc25864 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -83,6 +83,10 @@ class User < ApplicationRecord
     settings.default_sensitive
   end
 
+  def setting_unfollow_modal
+    settings.unfollow_modal
+  end
+
   def setting_boost_modal
     settings.boost_modal
   end