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
..
activitypub
admin
connection_pool
importer
nodeinfo
ostatus
rss
settings
translation_service
vacuum
access_token_extension.rb
account_reach_finder.rb
activity_tracker.rb
advanced_text_formatter.rb
application_extension.rb
ascii_folding.rb
cache_buster.rb
delivery_failure_tracker.rb
emoji_formatter.rb
entity_cache.rb
extractor.rb
fast_geometry_parser.rb
fast_ip_map.rb
feed_manager.rb
hash_object.rb
hashtag_normalizer.rb
html_aware_formatter.rb
inline_renderer.rb
link_details_extractor.rb
permalink_redirector.rb
plain_text_formatter.rb
potential_friendship_tracker.rb
rate_limiter.rb
redis_configuration.rb
request.rb
request_pool.rb
response_with_limit.rb
scope_parser.rb
scope_transformer.rb
search_query_parser.rb
search_query_transformer.rb
status_cache_hydrator.rb
status_filter.rb
status_finder.rb
status_reach_finder.rb
suspicious_sign_in_detector.rb
tag_manager.rb
text_formatter.rb
themes.rb
translation_service.rb
user_settings_serializer.rb
vacuum.rb
validation_error_formatter.rb
video_metadata_extractor.rb
webfinger.rb
webfinger_resource.rb