diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2023-01-18 18:41:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-18 18:41:24 +0100 |
| commit | 01405bc6f84fd9cfb974e1e668465148bda47ac5 (patch) | |
| tree | cb3103c82a337178a3548e1a157e0fa94be37bdb /app/models/form | |
| parent | 472fd4307f9c963aba57e537e3ca3a8f94dfa139 (diff) | |
| parent | 3f74235ac5b6ce6f13c531506f30c466da2a7aa1 (diff) | |
Merge pull request #2087 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
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 b595529f8..f76ee42e7 100644 --- a/app/models/form/admin_settings.rb +++ b/app/models/form/admin_settings.rb @@ -28,6 +28,7 @@ class Form::AdminSettings show_reblogs_in_public_timelines show_replies_in_public_timelines trends + trends_as_landing_page trendable_by_default trending_status_cw show_domain_blocks @@ -57,6 +58,7 @@ class Form::AdminSettings show_reblogs_in_public_timelines show_replies_in_public_timelines trends + trends_as_landing_page trendable_by_default trending_status_cw noindex |