Conflicts: - `app/models/concerns/user/has_settings.rb`: Upstream added a new helper for a setting, where glitch-soc had extra ones. Not a real conflict, added upstream's new helper without removing glitch-soc's ones.
cache_collection
EmailHelper
normalizes
DatabaseViewRecord.refresh
Rails/WhereRange
ActiveModel::Attributes
FollowLimitable
InetContainer
containing
contained
StatusTrend
PreviewCardTrend
locales
RankedTrend
attribute
rate_limit
OpenSSL::SSL::SSLError
reviewed
unreviewed
Reviewable