about summary refs log tree commit diff
path: root/app/models/tag.rb
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2019-10-09 00:30:15 +0200
committerGitHub <noreply@github.com>2019-10-09 00:30:15 +0200
commitc8bcf5cbfdc4b076eae0d9091e688436aa7f2508 (patch)
tree8e928bd8fef79212f6d6e5a4fb79bf0509359a9a /app/models/tag.rb
parent19cdc627658166664fb1571ec45564d237e63757 (diff)
Add admin setting to auto-approve hashtags (#12122)
Change inaccurate labels on other admin settings
Diffstat (limited to 'app/models/tag.rb')
-rw-r--r--app/models/tag.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/tag.rb b/app/models/tag.rb
index 82786daa8..59445a83b 100644
--- a/app/models/tag.rb
+++ b/app/models/tag.rb
@@ -76,7 +76,7 @@ class Tag < ApplicationRecord
   alias listable? listable
 
   def trendable
-    boolean_with_default('trendable', false)
+    boolean_with_default('trendable', Setting.trendable_by_default)
   end
 
   alias trendable? trendable