Conflicts: - `app/helpers/application_helper.rb`: Upstream added a helper where glitch-soc had its own, not really a conflict. Added upstream's helper.
BrowserDetection
cache_collection
CustomFilterCache
by_domain_length
DomainNormalizable
Rails/WhereRange
devise-two-factor
with_lock
with_redis_lock
RankedTrend
delete_matched
Performance/StringIdentifierArgument
reviewed
unreviewed
Reviewable