Claire b368c75029 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/concerns/sign_in_token_authentication_concern.rb`: Upstream removed this file, while glitch-soc had changes to deal with its theming system. Removed the file like upstream did.		2022-04-06 21:10:23 +02:00
..
account_moderation_note_policy.rb	…
account_policy.rb	Add trending statuses (#17431)	2022-02-25 00:34:14 +01:00
account_warning_policy.rb	Fix issues when attempting to appeal an old strike (#17554)	2022-02-16 22:29:48 +01:00
account_warning_preset_policy.rb	…
announcement_policy.rb	…
appeal_policy.rb	Add appeals (#17364)	2022-02-14 21:27:53 +01:00
application_policy.rb	…
backup_policy.rb	…
custom_emoji_policy.rb	…
delivery_policy.rb	Add management of delivery availability in Federation settings (#15771)	2021-05-05 23:39:02 +02:00
domain_allow_policy.rb	…
domain_block_policy.rb	…
email_domain_block_policy.rb	…
follow_recommendation_policy.rb	Add cold-start follow recommendations (#15945)	2021-04-12 12:37:14 +02:00
instance_policy.rb	Add ability to purge undeliverable domains from admin interface (#16686)	2021-12-17 23:01:21 +01:00
invite_policy.rb	…
ip_block_policy.rb	…
poll_policy.rb	…
preview_card_policy.rb	Add trending statuses (#17431)	2022-02-25 00:34:14 +01:00
preview_card_provider_policy.rb	Add trending statuses (#17431)	2022-02-25 00:34:14 +01:00
relay_policy.rb	…
report_note_policy.rb	…
report_policy.rb	…
rule_policy.rb	…
settings_policy.rb	…
status_policy.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-02-26 09:29:23 +01:00
tag_policy.rb	Add trending statuses (#17431)	2022-02-25 00:34:14 +01:00
user_policy.rb	Remove sign-in token authentication, instead send e-mail about new sign-in (#17970)	2022-04-06 20:58:12 +02:00