Claire f624ef2778 Merge commit 'b06fd54c305915527e3a6edc575dc23b623143ef' into glitch-soc/merge-upstream ...

Conflicts:
- `app/helpers/formatting_helper.rb`:
  Upstream wrapped some code glitch-soc had modified in an OTEL instrumentation span.
  Wrapped the modified code.

2024-11-03 20:51:58 +01:00

..

accept.rb

…

add.rb

…

announce.rb

Rename with_lock to with_redis_lock to avoid confusion with ActiveRecord's method (#24741)

2023-05-02 18:16:07 +02:00

block.rb

…

create.rb

Merge commit 'b06fd54c305915527e3a6edc575dc23b623143ef' into glitch-soc/merge-upstream

2024-11-03 20:51:58 +01:00

delete.rb

Rename with_lock to with_redis_lock to avoid confusion with ActiveRecord's method (#24741)

2023-05-02 18:16:07 +02:00

flag.rb

Extract COMMENT_SIZE_LIMIT constant in AP::Activity::Flag class (#30637)

2024-06-10 15:23:55 +00:00

follow.rb

…

like.rb

…

move.rb

Add Account#unavailable? and Account#permanently_unavailable? aliases (#28053)

2023-11-30 15:43:26 +00:00

reject.rb

…

remove.rb

…

undo.rb

…

update.rb

Fix post edits not being forwarded as expected (#26936)

2023-09-15 19:54:32 +02:00