mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-09-11 20:57:44 +00:00
Conflicts: - `app/models/status.rb`: Upstream added lines close to a glitch-soc only line, not a real conflict. Applied upstream's changes (added hooks) while keeping glitch-soc's changes (`local_only` scope). - `config/environments/production.rb`: Upstream removed a header, while we have glitch-soc specific ones. Removed the header removed upstream. |
||
---|---|---|
.. | ||
account_associations.rb | ||
account_avatar.rb | ||
account_counters.rb | ||
account_finder_concern.rb | ||
account_header.rb | ||
account_interactions.rb | ||
account_merging.rb | ||
attachmentable.rb | ||
cacheable.rb | ||
domain_materializable.rb | ||
domain_normalizable.rb | ||
expireable.rb | ||
follow_limitable.rb | ||
ldap_authenticable.rb | ||
lockable.rb | ||
omniauthable.rb | ||
paginable.rb | ||
pam_authenticable.rb | ||
rate_limitable.rb | ||
redisable.rb | ||
relationship_cacheable.rb | ||
remotable.rb | ||
status_snapshot_concern.rb | ||
status_threading_concern.rb |