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
..
0_duplicate_migrations.rb	Fix most rubocop issues (#2165)	2023-04-09 11:25:30 +02:00
0_post_deployment_migrations.rb
1_hosts.rb
2_whitelist_mode.rb
active_model_serializers.rb
application_controller_renderer.rb
assets.rb
backtrace_silencers.rb
blacklists.rb
cache_buster.rb
cache_logging.rb
chewy.rb	Change root Chewy strategy to emit a warning instead of erroring out in production mode (#24327)	2023-04-03 15:05:39 +02:00
content_security_policy.rb	Fix Rails/Present cop (#24688)	2023-04-30 06:47:50 +02:00
cookies_serializer.rb
cors.rb
devise.rb
doorkeeper.rb
fast_blank.rb
ffmpeg.rb
filter_parameter_logging.rb
http_client_proxy.rb
httplog.rb
inflections.rb	Change user settings to be stored in a more optimal way (#23630)	2023-03-30 14:44:00 +02:00
json_ld.rb
kaminari_config.rb
locale.rb
mail_delivery_job.rb
makara.rb
mime_types.rb
oj.rb
omniauth.rb
open_uri_redirection.rb
paperclip.rb	Fix Performance/RedundantMerge cop (#24817)	2023-05-04 05:25:43 +02:00
permissions_policy.rb
pghero.rb
preload_link_headers.rb
premailer_rails.rb
rack_attack.rb	Drop EOL Ruby 2.7 (#24237)	2023-04-27 01:46:18 +02:00
rack_attack_logging.rb
redis.rb
session_activations.rb
session_store.rb
sidekiq.rb
simple_form.rb	Fix most rubocop issues (#2165)	2023-04-09 11:25:30 +02:00
single_user_mode.rb
statsd.rb
stoplight.rb
strong_migrations.rb	Autofix Rubocop Style/NumericLiterals (#24468)	2023-04-23 22:30:07 +02:00
suppress_csrf_warnings.rb
trusted_proxies.rb
twitter_regex.rb
vapid.rb
webauthn.rb
wrap_parameters.rb