Add admin setting to auto-approve hashtags (#12122)
Change inaccurate labels on other admin settings
This commit is contained in:
parent
19cdc62765
commit
c8bcf5cbfd
5 changed files with 17 additions and 8 deletions
|
@ -30,6 +30,7 @@ class Form::AdminSettings
|
|||
mascot
|
||||
spam_check_enabled
|
||||
trends
|
||||
trendable_by_default
|
||||
show_domain_blocks
|
||||
show_domain_blocks_rationale
|
||||
noindex
|
||||
|
@ -46,6 +47,7 @@ class Form::AdminSettings
|
|||
profile_directory
|
||||
spam_check_enabled
|
||||
trends
|
||||
trendable_by_default
|
||||
noindex
|
||||
).freeze
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue