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_spec.rb
account_policy_spec.rb
backup_policy_spec.rb
custom_emoji_policy_spec.rb
domain_block_policy_spec.rb
email_domain_block_policy_spec.rb
instance_policy_spec.rb
invite_policy_spec.rb
relay_policy_spec.rb
report_note_policy_spec.rb
report_policy_spec.rb
settings_policy_spec.rb
status_policy_spec.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-02-10 19:09:27 +01:00
tag_policy_spec.rb
user_policy_spec.rb	Spelling (#17705)	2022-03-06 22:51:40 +01:00