Conflicts: - `app/models/status.rb`: Upstream refactored `visibility` handling to a concern, while glitch-soc had custom code adjacent to some of the changed lines. Applied upstream's changes. - `lib/mastodon/version.rb`: Upstream moved some definitions to `config/mastodon.yml`, while glitch-soc's default github repository had been modified. Applied upstream's changes and updated `config/mastodon.yml` accordingly. |
||
---|---|---|
.. | ||
account | ||
notification | ||
status | ||
user | ||
attachmentable.rb | ||
browser_detection.rb | ||
cacheable.rb | ||
custom_filter_cache.rb | ||
database_view_record.rb | ||
domain_materializable.rb | ||
domain_normalizable.rb | ||
expireable.rb | ||
follow_limitable.rb | ||
inet_container.rb | ||
legacy_otp_secret.rb | ||
lockable.rb | ||
paginable.rb | ||
ranked_trend.rb | ||
rate_limitable.rb | ||
redisable.rb | ||
relationship_cacheable.rb | ||
remotable.rb | ||
reviewable.rb |