Conflicts: - `config/settings.yml`: Not a real conflict, upstream removed settings that are identical in glitch-soc but textually adjacent to glitch-soc-only settings. Removed what upstream removed.
BrowserDetection
cache_collection
CustomFilterCache
DatabaseViewRecord.refresh
by_domain_length
DomainNormalizable
Rails/WhereRange
ActiveModel::Attributes
FollowLimitable
InetContainer
containing
contained
with_lock
with_redis_lock
StatusTrend
PreviewCardTrend
locales
RankedTrend
attribute
rate_limit
delete_matched
OpenSSL::SSL::SSLError
reviewed
unreviewed
Reviewable