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
..
attachment_extensions.rb	Run rubocop formatting except line length (#23632)	2023-02-18 06:56:20 +09:00
blurhash_transcoder.rb	blurhash_transcoder: prevent out-of-bound reads with <8bpp images (#20388)	2022-11-11 07:45:16 +01:00
color_extractor.rb	Fix Performance/Sum cop (#24788)	2023-05-02 16:10:40 +02:00
gif_transcoder.rb	Enable Rubocop Style/StringConcatenation defaults (#23792)	2023-02-22 09:54:36 +09:00
image_extractor.rb
lazy_thumbnail.rb
response_with_limit_adapter.rb
transcoder.rb	Fix audio always being re-encoded even for passthrough-eligible media (#1839)	2022-09-02 09:29:31 +02:00
type_corrector.rb	Enable Rubocop Style/StringConcatenation defaults (#23792)	2023-02-22 09:54:36 +09:00
url_generator_extensions.rb