Claire 2d09653d50 Merge commit '0d7340380cf3094335d8bc67f7c465e2b154566a' into glitch-soc/merge-upstream ...

Conflicts:
- app/controllers/application_controller.rb:
  Upstream added an `include` where we had an extra `include` due to
  glitch-soc's theming system.
  Added upstream's new `include`.

2023-07-13 13:35:15 +02:00

..

account_associations.rb

…

account_avatar.rb

…

account_counters.rb

…

account_finder_concern.rb

…

account_header.rb

…

account_interactions.rb

…

account_merging.rb

…

account_search.rb

…

attachmentable.rb

…

cacheable.rb

…

domain_materializable.rb

…

domain_normalizable.rb

…

expireable.rb

…

follow_limitable.rb

…

has_user_settings.rb

…

ldap_authenticable.rb

…

lockable.rb

…

omniauthable.rb

…

paginable.rb

…

pam_authenticable.rb

…

rate_limitable.rb

…

redisable.rb

…

relationship_cacheable.rb

…

remotable.rb

…

status_safe_reblog_insert.rb

…

status_snapshot_concern.rb

…

status_threading_concern.rb

…