Commit graph

15 commits

Author SHA1 Message Date
KMY
055045981f Merge remote-tracking branch 'parent/main' into upstream-20241119 2024-11-19 08:49:55 +09:00
Matt Jankowski
da826fe959
Use hash arguments to order when possible (Rails 7.2) (#32915) 2024-11-18 15:07:53 +00:00
Matt Jankowski
1c6f53e70f
Use with_options blocks in Associations concern (#32840) 2024-11-18 08:07:18 +00:00
KMY(雪あすか)
141ed8b171
Fix: リモートからのアカウント削除時エラーが出る問題 (#872) (#874)
* Fix: アカウント削除時エラーが出る問題

* nilに変更

* 削除するタイミングと条件を調整

* Fix test
2024-10-10 08:42:50 +09:00
KMY
c905714459 Merge remote-tracking branch 'parent/main' into upstream-20240926 2024-09-26 08:29:41 +09:00
Matt Jankowski
5405bdd344
Remove unused E2EE messaging code (#31193) 2024-09-18 09:27:43 +00:00
KMY
80789a603a Merge remote-tracking branch 'parent/main' into upstream-20240503 2024-05-03 11:17:22 +09:00
Matt Jankowski
88882fbbee
Move Rails/HABTM cop out of todo (#30118) 2024-05-02 09:40:05 +00:00
KMY
fa96bf2e87 Merge remote-tracking branch 'parent/main' into upstream-20240308 2024-03-08 08:08:34 +09:00
Eugen Rochko
50b17f7e10
Add notification policies and notification requests (#29366) 2024-03-07 14:53:37 +00:00
KMY(雪あすか)
2ab9ea642a
Add: #595 リモート保留中アカウントからメンションが来た場合にuriを記録し、承認時にフェッチしに行く処理 (#620)
* Add: #591 リモート保留中アカウントからメンションが来た場合にuriを記録し、承認時にフェッチしに行く処理

* Rename fetch_remove_status_worker.rb to fetch_remote_status_worker.rb

* Wip

* Add lock code
2024-02-29 12:54:47 +09:00
KMY
a6b57e3890 Merge remote-tracking branch 'parent/main' into upstream-20231221 2023-12-21 08:37:12 +09:00
Eugen Rochko
b5ac61b2c5
Change algorithm of follow recommendations (#28314)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-12-19 10:59:43 +00:00
KMY
94c2396a34 Merge remote-tracking branch 'parent/main' into upstream-20231204 2023-12-04 12:04:52 +09:00
Matt Jankowski
440b80b2e7
Model concerns organization into module namespaces (#28149) 2023-12-01 11:00:41 +00:00
Renamed from app/models/concerns/account_associations.rb (Browse further)