mastodon/app/models/concerns
Claire 32c70d2f09 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/views/admin/announcements/edit.html.haml`:
  Upstream change too close to theming-related glitch-soc change.
  Ported upstream changes.
- `app/views/admin/announcements/new.html.haml`
  Upstream change too close to theming-related glitch-soc change.
  Ported upstream changes.
2022-11-14 08:35:55 +01:00
..
account_associations.rb
account_avatar.rb Fix metadata scrubbing removing color profile from images (#20389) 2022-11-11 09:20:10 +01:00
account_counters.rb
account_finder_concern.rb
account_header.rb Fix metadata scrubbing removing color profile from images (#20389) 2022-11-11 09:20:10 +01:00
account_interactions.rb Add ability to filter followed accounts' posts by language (#19095) 2022-09-20 23:51:21 +02:00
account_merging.rb
attachmentable.rb
cacheable.rb
domain_materializable.rb
domain_normalizable.rb Fix error when invalid domain name is submitted (#19474) 2022-11-14 08:07:14 +01:00
expireable.rb
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
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 Remove dead code and refactor status threading code (#20357) 2022-11-10 22:30:00 +01:00