Claire 93bdb16817 Merge commit '8ba1487f30685fff4555a7537d3e6c765c73a07c' into glitch-soc/merge-upstream ...

Conflicts:
- `spec/models/concerns/account/interactions_spec.rb`:
  Conflict due to glitch-soc having modified specs ages ago.
  The covered code is the same as upstream, though.
  Took upstream's version of the specs.
- `spec/models/status_spec.rb`:
  Conflict because glitch-soc tests for an extra glitch-soc-specific
  method.
  Added upstream's changes while keeping the glitch-soc method.

2025-06-24 22:43:43 +02:00

..

0_post_deployment_migrations.rb

Fix behavior of database schema loading with SKIP_POST_DEPLOYMENT_MIGRATIONS (#34089)

2025-03-07 13:41:16 +00:00

1_hosts.rb

Update rubocop to version 1.76.0 (#34926)

2025-06-05 12:09:05 +00:00

3_omniauth.rb

Use config_for for omniauth enabled values (#35015)

2025-06-24 09:32:13 +00:00

active_model_serializers.rb

Enable Rubocop Style/FrozenStringLiteralComment (#23793)

2023-07-12 09:47:08 +02:00

active_record_encryption.rb

Change Active Record Encryption variable check to check for emptiness (#32537)

2024-10-16 08:43:45 +00:00

allowed_private_addresses.rb

Move ALLOWED_PRIVATE_ADDRESSES parsing to an initializer (#32850)

2024-11-12 13:00:52 +00:00

application_controller_renderer.rb

Add empty line after ✨magic✨ frozen string comment (#29696)

2024-03-21 14:12:50 +00:00

backtrace_silencers.rb

Fix Style/StringLiterals cop (#30005)

2024-04-19 20:33:00 +00:00

cache_logging.rb

Enable Rubocop Style/FrozenStringLiteralComment (#23793)

2023-07-12 09:47:08 +02:00

chewy.rb

Drop redis namespace code (except for Rails cache) (#34665)

2025-05-20 13:02:09 +00:00

content_security_policy.rb

Update rubocop to version 1.76.0 (#34926)

2025-06-05 12:09:05 +00:00

cookie_rotator.rb

Revert "Remove cookie rotator (#32289)" (#34892)

2025-06-02 13:51:27 +00:00

cookies_serializer.rb

Enable Rubocop Style/FrozenStringLiteralComment (#23793)

2023-07-12 09:47:08 +02:00

cors.rb

Add userinfo oauth endpoint (#32548)

2024-10-30 14:38:10 +00:00

deprecations.rb

Move "limited federation mode" config to x.mastodon area (#35041)

2025-06-16 06:13:03 +00:00

devise.rb

Fix Style/FormatStringToken cop (#34861)

2025-06-02 07:37:33 +00:00

doorkeeper.rb

Update dependency doorkeeper to v5.8.0 (#33000)

2024-11-21 13:48:30 +00:00

email_domains_lists.rb

Finish email allow/deny list naming migration (#30530)

2024-08-13 07:37:32 +00:00

fast_blank.rb

Enable Rubocop Style/FrozenStringLiteralComment (#23793)

2023-07-12 09:47:08 +02:00

ffmpeg.rb

Use ENV.fetch for ffmpeg/ffprobe defaults (#35081)

2025-06-18 09:43:25 +00:00

filter_parameter_logging.rb

Update rails to version 8.0.1 (#32357)

2025-01-03 16:08:21 +00:00

http_client_proxy.rb

Fix Style/StringLiterals cop (#30005)

2024-04-19 20:33:00 +00:00

httplog.rb

Disable httplog gem in production (#32776)

2024-11-05 08:55:34 +00:00

i18n.rb

Add the Interlingua locale (#30828)

2024-06-25 14:05:24 +00:00

inflections.rb

Remove unused E2EE messaging code (#31193)

2024-09-18 09:27:43 +00:00

json_ld_identity.rb

Move json_ld context loaders to config/initializers (#27590)

2023-10-31 15:21:23 +00:00

json_ld_security.rb

Move json_ld context loaders to config/initializers (#27590)

2023-10-31 15:21:23 +00:00

kaminari_config.rb

…

linzer.rb

Update to linzer 0.7 (#34765)

2025-05-23 06:43:02 +00:00

locale.rb

…

mail_delivery_job.rb

Enable Rubocop Style/FrozenStringLiteralComment (#23793)

2023-07-12 09:47:08 +02:00

mime_types.rb

Update rack to version 3 (#34816)

2025-05-28 08:39:17 +00:00

oj.rb

Enable Rubocop Style/FrozenStringLiteralComment (#23793)

2023-07-12 09:47:08 +02:00

open_redirects.rb

Use unchanging github links in docs/comments (#29545)

2024-03-11 15:14:55 +00:00

open_uri_redirection.rb

Enable Rubocop Style/FrozenStringLiteralComment (#23793)

2023-07-12 09:47:08 +02:00

opentelemetry.rb

Fix /health endpoint when OTEL is configured (#33362)

2024-12-19 10:44:44 +00:00

paperclip.rb

Fix Style/PreferredHashMethods cop (#34775)

2025-05-23 07:11:59 +00:00

permissions_policy.rb

Run bin/rails app:update with Rails 7.1 (#27522)

2023-10-25 13:56:09 +00:00

pghero.rb

Enable Rubocop Style/FrozenStringLiteralComment (#23793)

2023-07-12 09:47:08 +02:00

preload_link_headers.rb

Enable Rubocop Style/FrozenStringLiteralComment (#23793)

2023-07-12 09:47:08 +02:00

premailer_rails.rb

Rename PremailerWebpackStrategy -> PremailerBundledAssetStrategy (#29934)

2024-04-15 09:16:59 +00:00

prometheus_exporter.rb

Start local prometheus_exporter server only in puma/sidekiq startup (#35005)

2025-06-11 13:37:59 +00:00

propshaft.rb

Add material design icons to admin/settings views (#27780)

2024-04-23 16:43:49 +00:00

rack_attack_logging.rb

Fix rack attack match_type value typo in logging config (#30514)

2024-06-03 07:16:01 +00:00

rack_attack.rb

Merge commit from fork

2025-02-27 15:44:35 +01:00

redis.rb

Enable Rubocop Style/FrozenStringLiteralComment (#23793)

2023-07-12 09:47:08 +02:00

session_activations.rb

…

session_store.rb

Fix rubocop Layout/ArgumentAlignment cop (#26060)

2023-09-28 15:48:47 +02:00

settings_digests.rb

Extend custom CSS cache time with digest paths (#33207)

2025-01-08 08:48:45 +00:00

sidekiq.rb

Start local prometheus_exporter server only in puma/sidekiq startup (#35005)

2025-06-11 13:37:59 +00:00

simple_cov_source_file.rb

Move simplecov config into rails_helper (#30302)

2024-05-15 09:33:36 +00:00

simple_form.rb

Merge commit '129e72b91494f30777cf4fa8a0905de2dccedba7' into glitch-soc/merge-upstream

2025-06-03 18:34:37 +02:00

single_user_mode.rb

…

statistics.rb

Only register stats dirs when command available (#33454)

2025-01-04 17:44:49 +00:00

stoplight.rb

Refactor (ruby) redis configuration (#31694)

2024-09-02 14:19:55 +00:00

strong_migrations.rb

Drop support for PostgreSQL 12 (#34744)

2025-05-20 14:48:29 +00:00

suppress_csrf_warnings.rb

…

trusted_proxies.rb

Assign a proc to Rack::Request.ip_filter instead of patching method (#28380)

2023-12-15 14:33:56 +00:00

twitter_regex.rb

Allow @ at the end of an URL (#31124)

2024-07-25 15:02:58 +00:00

vips.rb

Add detail about running version on vips error failure (#30858)

2024-06-27 16:27:42 +00:00

webauthn.rb

Use preferred allowed origin configuration style for webauthn config (#33953)

2025-02-18 15:03:43 +00:00

wrap_parameters.rb

Enable Rubocop Style/FrozenStringLiteralComment (#23793)

2023-07-12 09:47:08 +02:00