mastodon/app/models/concerns
Claire aaa9ec340b Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/lib/formatter.rb`:
  Upstream completely refactored the formatting code and removed that file,
  while glitch-soc had code for Markdown and HTML toots.
  Took upstream code, glitch-soc changes will be re-implemented on top of the
  refactored classes in a later commit.
- `app/models/status.rb`:
  Upstream refactored status edit handling and moved code to
  `app/models/concerns/status_snapshot_concern.rb`.
  Applied glitch-soc's changes to that file.
- `app/serializers/activitypub/note_serializer.rb`:
  Not really a conflict, just a line added too close to one modified by
  glitch-soc.
  Applied upstream changes while keeping the glitch-soc-modified one.
- `app/services/update_status_service.rb`:
  Not really a conflict, upstream modified a line adjacent to one added by
  glitch-soc.
  Applied upstream changes while keeping the glitch-soc line.
- `app/views/statuses/_simple_status.html.haml`:
  Upstream refactored formatting, glitch-soc changed the markup slightly.
  Applied upstream changes.
- `spec/lib/formatter_spec.rb`:
  Upstream completely refactored the formatting code and removed that file,
  while glitch-soc had code for Markdown and HTML toots.
  Took upstream code, glitch-soc changes will be re-implemented on top of the
  refactored classes in a later commit.
2022-03-26 19:18:55 +01:00
..
account_associations.rb Add notifications for statuses deleted by moderators (#17204) 2022-01-17 09:41:33 +01:00
account_avatar.rb Fix to be able to redownload avatar and header (#16190) 2021-05-11 14:19:22 +02:00
account_counters.rb Fix account deletion sometimes failing because of optimistic locks (#16317) 2021-06-02 17:41:25 +02:00
account_finder_concern.rb Create instance actor if it hasn't been properly seeded (#15693) 2021-02-09 18:12:54 +01:00
account_header.rb Fix to be able to redownload avatar and header (#16190) 2021-05-11 14:19:22 +02:00
account_interactions.rb Add remove from followers api (#16864) 2021-10-18 12:02:35 +02:00
account_merging.rb Update fix-duplicates maintenance task (#17731) 2022-03-12 08:33:11 +01:00
attachmentable.rb Switch from unmaintained paperclip to kt-paperclip (#16724) 2021-09-29 23:52:36 +02:00
cacheable.rb Fix cache_associated no longer working (#7320) 2018-05-03 10:41:41 +02:00
domain_materializable.rb Fix performance on instances list in admin UI (#15282) 2020-12-14 09:06:34 +01:00
domain_normalizable.rb Fix admin page crashing when trying to block an invalid domain name (#13884) 2020-06-01 03:47:20 +02:00
expireable.rb Fix not being able to change world filter expiration back to “Never” (#15858) 2021-03-12 05:25:50 +01: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 Add authentication history (#16408) 2021-06-21 17:07:30 +02:00
omniauthable.rb Allow login through OpenID Connect (#16221) 2022-03-09 12:07:35 +01:00
paginable.rb allow pagination by min_id and max_id (#14776) 2020-09-12 17:09:49 +02:00
pam_authenticable.rb Fix LDAP/PAM/SAML/CAS users not being approved instantly (#10621) 2019-04-25 02:49:25 +02:00
rate_limitable.rb Add specific rate limits for posting and following (#13172) 2020-03-08 15:17:39 +01:00
redisable.rb Create Redisable#redis (#9633) 2019-02-02 19:11:38 +01:00
relationship_cacheable.rb Cache relationships in API (#6482) 2018-02-18 03:14:46 +01:00
remotable.rb Fix to be able to redownload avatar and header (#16190) 2021-05-11 14:19:22 +02:00
status_snapshot_concern.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-03-26 19:18:55 +01:00
status_threading_concern.rb Optimize map { ... }.compact calls (#15513) 2021-01-10 00:32:01 +01:00
user_roles.rb Add moderation API (#9387) 2019-06-20 02:52:34 +02:00