mastodon/app/models/concerns
Claire 5ac380c122 Merge branch 'main' into glitch-soc/merge-upstream
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.
2023-03-22 19:50:11 +01:00
..
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 Run rubocop formatting except line length (#23632) 2023-02-18 06:56:20 +09:00
follow_limitable.rb Fix being able to import more than allowed number of follows (#15384) 2020-12-26 23:52:46 +01:00
ldap_authenticable.rb
lockable.rb Refactor how Redis locks are created (#18400) 2022-05-13 00:02:35 +02:00
omniauthable.rb
paginable.rb Autofix Rubocop Style/Lambda (#23696) 2023-02-18 12:39:00 +01:00
pam_authenticable.rb Autofix Rubocop Style/RedundantBegin (#23703) 2023-02-19 07:09:40 +09:00
rate_limitable.rb
redisable.rb
relationship_cacheable.rb
remotable.rb Autofix Rails/EagerEvaluationLogMessage (#23429) 2023-02-07 03:44:36 +01:00
status_snapshot_concern.rb
status_threading_concern.rb