queer-af/mastodon
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
mastodon/app/models/concerns
History
Claire 2d029dedd9 Merge commit '0ad2413b35287958f59073a5b63aecc659a64d98' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/styles/mastodon/forms.scss`:
  Conflict because we ran eslint autofix on upstream files.
- `config/initializers/content_security_policy.rb`:
  Code style changes but we have a different version.
  Kept our version.
- `streaming/index.js`:
  Upstream fixed a typo close to glitch-soc-only code.
  Applied upstream's changes.
2023-05-08 15:28:36 +02: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 Fix Rails/InverseOf cop (#24732) 2023-04-30 14:06:53 +02:00
account_merging.rb Autofix Rubocop Style/RedundantBegin (#23703) 2023-02-19 07:09:40 +09:00
attachmentable.rb Fix Rails/CompactBlank cop (#24690) 2023-04-30 14:07:21 +02:00
cacheable.rb
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
has_user_settings.rb Migrate glitch-soc's exclusive user settings 2023-03-31 22:50:57 +02:00
ldap_authenticable.rb Fix unescaped user input in LDAP query (#24379) 2023-04-04 12:42:38 +02:00
lockable.rb Refactor how Redis locks are created (#18400) 2022-05-13 00:02:35 +02:00
omniauthable.rb Drop EOL Ruby 2.7 (#24237) 2023-04-27 01:46:18 +02: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
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 Refactoring relations_map (#24195) 2023-03-21 10:32:58 +01:00