This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
mastodon/app/models/concerns
Claire 4ed09276d5 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `.prettierignore`:
  Upstream added a line at the end of the file, while glitch-soc had its own
  extra lines.
  Took upstream's change.
- `CONTRIBUTING.md`:
  We have our custom CONTRIBUTING.md quoting upstream. Upstream made changes.
  Ported upstream changes.
- `app/controllers/application_controller.rb`:
  Upstream made code style changes in a method that is entirely replaced
  in glitch-soc.
  Ignored the change.
- `app/models/account.rb`:
  Code style changes textually close to glitch-soc-specific changes.
  Ported upstream changes.
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream code style changes.
  Ignored them.
2023-02-25 14:00:40 +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 metadata scrubbing removing color profile from images (#20389) 2022-11-11 09:20:10 +01: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 Fix situations in which instance actor can be set to a Mastodon-incompatible name (#22307) 2023-01-18 16:33:03 +01:00
account_header.rb Fix metadata scrubbing removing color profile from images (#20389) 2022-11-11 09:20:10 +01:00
account_interactions.rb Autofix Rubocop Style/UnpackFirst (#23741) 2023-02-20 06:51:43 +01:00
account_merging.rb Autofix Rubocop Style/RedundantBegin (#23703) 2023-02-19 07:09:40 +09: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 unbounded recursion in account discovery (#22025) 2022-12-07 00:15:24 +01:00
domain_normalizable.rb Fix error when invalid domain name is submitted (#19474) 2022-11-14 08:07:14 +01:00
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 Add authentication history (#16408) 2021-06-21 17:07:30 +02:00
lockable.rb Refactor how Redis locks are created (#18400) 2022-05-13 00:02:35 +02:00
omniauthable.rb Autofix Rubocop Style/IfUnlessModifier (#23697) 2023-02-18 12:37:47 +01:00
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 Add specific rate limits for posting and following (#13172) 2020-03-08 15:17:39 +01:00
redisable.rb Refactor how Redis locks are created (#18400) 2022-05-13 00:02:35 +02:00
relationship_cacheable.rb Cache relationships in API (#6482) 2018-02-18 03:14:46 +01:00
remotable.rb Autofix Rails/EagerEvaluationLogMessage (#23429) 2023-02-07 03:44:36 +01: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 Remove dead code and refactor status threading code (#20357) 2022-11-10 22:30:00 +01:00