diff options
| author | Reverite <github@reverite.sh> | 2019-10-11 14:55:34 -0700 |
|---|---|---|
| committer | Reverite <github@reverite.sh> | 2019-10-11 14:55:34 -0700 |
| commit | b63bcefbdf19eece58ae430bce14031d147ab796 (patch) | |
| tree | 9ce7c29898ddf3f4c4af20890492409793d2fb0f /app/models/form | |
| parent | 38afc782051fe6faf06c2c9ca20304dd946cfb5c (diff) | |
| parent | fbe1de114fca16d63ff651425f69eb534ba013e9 (diff) | |
Merge branch 'glitch' into production
Diffstat (limited to 'app/models/form')
| -rw-r--r-- | app/models/form/admin_settings.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/models/form/admin_settings.rb b/app/models/form/admin_settings.rb index f1ee38325..3398af169 100644 --- a/app/models/form/admin_settings.rb +++ b/app/models/form/admin_settings.rb @@ -36,6 +36,7 @@ class Form::AdminSettings show_replies_in_public_timelines spam_check_enabled trends + trendable_by_default show_domain_blocks show_domain_blocks_rationale noindex @@ -56,6 +57,7 @@ class Form::AdminSettings show_replies_in_public_timelines spam_check_enabled trends + trendable_by_default noindex ).freeze |