1
0
mirror of https://github.com/funamitech/mastodon synced 2024-12-17 08:09:25 +09:00
YuruToot/app/models/concerns
Claire ef3d15554b Merge commit 'c645490d553124d800d30488595f7d2d9d61584d' into glitch-soc/merge-upstream
Conflicts:
- `Gemfile.lock`:
  Changes were already cherry-picked and updated further in glitch-soc.
  Kept glitch-soc's version.
- `README.md`:
  Upstream updated its README, we have a completely different one.
  Kept glitch-soc's README.
- `app/models/account.rb`:
  Not a real conflict, upstream updated some lines textually adjacent
  to glitch-soc-specific lines.
  Ported upstream's changes.
2024-02-24 14:46:14 +01:00
..
account Move "everyone" role and "instance actor" account magic number IDs to constants (#29260) 2024-02-19 11:09:43 +00:00
status Merge commit '272592d16d40e804ec325ef3b5e6de9bbad5f2dd' into glitch-soc/merge-upstream 2023-12-20 22:05:31 +01:00
user Merge pull request from GHSA-vm39-j3vx-pch3 2024-02-14 15:25:15 +01:00
attachmentable.rb Fix .opus file uploads being misidentified by Paperclip (#28580) 2024-01-03 19:02:53 +00:00
cacheable.rb Fix cache_associated no longer working (#7320) 2018-05-03 10:41:41 +02:00
database_view_record.rb Extract scenic view model common methods to concern (#28111) 2024-02-06 09:08:07 +00: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
lockable.rb Rename with_lock to with_redis_lock to avoid confusion with ActiveRecord's method (#24741) 2023-05-02 18:16:07 +02:00
paginable.rb Autofix Rubocop Style/Lambda (#23696) 2023-02-18 12:39:00 +01: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 Fix call to inefficient delete_matched cache method in domain blocks (#28374) 2023-12-18 16:14:43 +00:00
remotable.rb Fix Performance/StringIdentifierArgument cop (#28508) 2023-12-29 10:23:30 +00:00