Conflicts: - `app/helpers/formatting_helper.rb`: Upstream wrapped some code glitch-soc had modified in an OTEL instrumentation span. Wrapped the modified code.
BrowserDetection
cache_collection
CustomFilterCache
by_domain_length
DomainNormalizable
Rails/WhereRange
devise-two-factor
with_lock
with_redis_lock
StatusTrend
PreviewCardTrend
locales
RankedTrend
delete_matched
OpenSSL::SSL::SSLError
reviewed
unreviewed
Reviewable