about summary refs log tree commit diff
path: root/app/models/form/admin_settings.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/form/admin_settings.rb
parent19cdc627658166664fb1571ec45564d237e63757 (diff)
Add admin setting to auto-approve hashtags (#12122)
Change inaccurate labels on other admin settings
Diffstat (limited to 'app/models/form/admin_settings.rb')
-rw-r--r--app/models/form/admin_settings.rb2
1 files changed, 2 insertions, 0 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