Claire d77fbbed73 Merge commit 'f877aa9d70d0d600961989b8e97c0e0ce3ac1db6' into glitch-soc/merge-upstream ... Conflicts: - `.github/dependabot.yml`: Upstream made changes, but we had removed it. Discarded upstream changes. - `.rubocop_todo.yml`: Upstream regenerated the file, we had some glitch-soc-specific ignores. - `app/models/account_statuses_filter.rb`: Minor upstream code style change where glitch-soc had slightly different code due to handling of local-only posts. Updated to match upstream's code style. - `app/models/status.rb`: Upstream moved ActiveRecord callback definitions, glitch-soc had an extra one. Moved the definitions as upstream did. - `app/services/backup_service.rb`: Upstream rewrote a lot of the backup service, glitch-soc had changes because of exporting local-only posts. Took upstream changes and added back code to deal with local-only posts. - `config/routes.rb`: Upstream split the file into different files, while glitch-soc had a few extra routes. Extra routes added to `config/routes/settings.rb`, `config/routes/api.rb` and `config/routes/admin.rb` - `db/schema.rb`: Upstream has new migrations, while glitch-soc had an extra migration. Updated the expected serial number to match upstream's. - `lib/mastodon/version.rb`: Upstream added support to set version tags from environment variables, while glitch-soc has an extra `+glitch` tag. Changed the code to support upstream's feature but prepending a `+glitch`. - `spec/lib/activitypub/activity/create_spec.rb`: Minor code style change upstream, while glitch-soc has extra tests due to `directMessage` handling. Applied upstream's changes while keeping glitch-soc's extra tests. - `spec/models/concerns/account_interactions_spec.rb`: Minor code style change upstream, while glitch-soc has extra tests. Applied upstream's changes while keeping glitch-soc's extra tests.		2023-05-08 19:28:21 +02:00
..
admin
account_moderation_note_policy_spec.rb
account_policy_spec.rb
account_warning_preset_policy_spec.rb
announcement_policy_spec.rb
appeal_policy_spec.rb
backup_policy_spec.rb
canonical_email_block_policy_spec.rb
custom_emoji_policy_spec.rb
delivery_policy_spec.rb
domain_block_policy_spec.rb
email_domain_block_policy_spec.rb
follow_recommendation_policy_spec.rb
instance_policy_spec.rb
invite_policy_spec.rb
ip_block_policy_spec.rb
preview_card_policy_spec.rb
preview_card_provider_policy_spec.rb
relay_policy_spec.rb
report_note_policy_spec.rb
report_policy_spec.rb
rule_policy_spec.rb
settings_policy_spec.rb
status_policy_spec.rb
tag_policy_spec.rb
user_policy_spec.rb
webhook_policy_spec.rb