Claire 1fbd1fa5c4 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/settings/preferences_controller.rb`: Conflicts due to us having more user settings and upstream dropping `hide_network` (to replace it with an account attribute, properly migrated). Dropped `hide_network` like upstream. - `app/lib/user_settings_decorator.rb`: Conflicts due to us having more user settings and upstream dropping `hide_network` (to replace it with an account attribute, properly migrated). Dropped `hide_network` like upstream. - `app/models/status.rb`: Conflict because of slight change in how glitch-soc handles the scope to filter out local-only posts for anonymous viewers. Took upstream's changes and re-applied glitch-soc's change. - `app/models/user.rb`: Conflicts due to us having more user settings and upstream dropping `hide_network` (to replace it with an account attribute, properly migrated). Dropped `hide_network` like upstream. - `app/views/directories/index.html.haml`: Conflict because upstream redesigned that page while glitch-soc had a minor change to support hiding the number of followers. Ported glitch-soc's change on top of upstream's redesign. Additional changes: - `app/models/account_statuses_filter.rb`: See change to `app/models/status.rb`.		2022-03-08 20:22:54 +01: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
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	Spelling (#17705)	2022-03-06 22:51:40 +01:00