Claire f624ef2778 Merge commit 'b06fd54c305915527e3a6edc575dc23b623143ef' into glitch-soc/merge-upstream ...

Conflicts:
- `app/helpers/formatting_helper.rb`:
  Upstream wrapped some code glitch-soc had modified in an OTEL instrumentation span.
  Wrapped the modified code.

2024-11-03 20:51:58 +01:00

..

action_dispatch

…

active_record

…

arel

…

assets

…

chewy

Refactor (ruby) redis configuration (#31694)

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

devise/strategies

…

elasticsearch

…

generators/post_deployment_migration

…

linter

…

mastodon

Merge commit 'b06fd54c305915527e3a6edc575dc23b623143ef' into glitch-soc/merge-upstream

2024-11-03 20:51:58 +01:00

paperclip

Fix typo causing incorrect error being raised in blurhash processing failure (#32104)

2024-09-26 07:40:59 +00:00

rails

…

redis

…

sanitize_ext

Merge commit 'c40ab43dc703be988c277d4ba6b7987a3a80e16c' into glitch-soc/merge-upstream

2024-10-06 16:07:58 +02:00

simple_navigation

…

stoplight

Fix compatibility with Redis < 6.2 again (#30412)

2024-06-19 16:59:37 +00:00

tasks

Merge commit '7c10b0fb7a078661558fef86399d86831423260c' into glitch-soc/merge-upstream

2024-10-14 19:46:52 +02:00

templates/haml/scaffold

…

terrapin

…

webpacker

…

exceptions.rb

Add OpenSSL::SSL::SSLError to http connection errors wrapper (#32307)

2024-10-08 14:59:51 +00:00

premailer_bundled_asset_strategy.rb

…

public_file_server_middleware.rb

…