diff options
| author | ThibG <thib@sitedethib.com> | 2019-10-11 22:28:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-11 22:28:11 +0200 |
| commit | ef925f31a66d1cbc95bff11669d05e2924d8ce85 (patch) | |
| tree | aadbb60d22a196075fe1faaeeae169e5badead57 /app/models/form/admin_settings.rb | |
| parent | b3dd0d276d52042828e11bf325015f5d7f4624ca (diff) | |
| parent | 877e8c9d799eae663526609642e0c0c9a4612bda (diff) | |
Merge pull request #1233 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/form/admin_settings.rb')
| -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 |