f624ef2778
Conflicts: - `app/helpers/formatting_helper.rb`: Upstream wrapped some code glitch-soc had modified in an OTEL instrumentation span. Wrapped the modified code. |
||
---|---|---|
.. | ||
action_dispatch | ||
active_record | ||
arel | ||
assets | ||
chewy | ||
devise/strategies | ||
elasticsearch | ||
generators/post_deployment_migration | ||
linter | ||
mastodon | ||
paperclip | ||
rails | ||
redis | ||
sanitize_ext | ||
simple_navigation | ||
stoplight | ||
tasks | ||
templates/haml/scaffold | ||
terrapin | ||
webpacker | ||
exceptions.rb | ||
premailer_bundled_asset_strategy.rb | ||
public_file_server_middleware.rb |