diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-02-26 21:15:19 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-26 21:15:19 +0100 |
| commit | 551820cbd9e5beebd16f16205143e2263d4f2d51 (patch) | |
| tree | 6868722efeb660c0031a22aecfdc4b2c5bc9dcc6 /app/models/form/admin_settings.rb | |
| parent | e48eaf64cc7cb0cfab388331c4823ee5fb580d59 (diff) | |
| parent | 67c6f37e269a4ebb538e019351f894183f3c1439 (diff) | |
Merge pull request #1704 from ClearlyClaire/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 34f14e312..5627f8a84 100644 --- a/app/models/form/admin_settings.rb +++ b/app/models/form/admin_settings.rb @@ -35,6 +35,7 @@ class Form::AdminSettings show_replies_in_public_timelines trends trendable_by_default + trending_status_cw show_domain_blocks show_domain_blocks_rationale noindex @@ -57,6 +58,7 @@ class Form::AdminSettings show_replies_in_public_timelines trends trendable_by_default + trending_status_cw noindex require_invite_text captcha_enabled |