diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2019-10-09 00:30:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-09 00:30:15 +0200 |
| commit | c8bcf5cbfdc4b076eae0d9091e688436aa7f2508 (patch) | |
| tree | 8e928bd8fef79212f6d6e5a4fb79bf0509359a9a /app/models | |
| parent | 19cdc627658166664fb1571ec45564d237e63757 (diff) | |
Add admin setting to auto-approve hashtags (#12122)
Change inaccurate labels on other admin settings
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/form/admin_settings.rb | 2 | ||||
| -rw-r--r-- | app/models/tag.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/app/models/form/admin_settings.rb b/app/models/form/admin_settings.rb index 24196e182..70e9c21f1 100644 --- a/app/models/form/admin_settings.rb +++ b/app/models/form/admin_settings.rb @@ -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 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 |