mastodon/spec/lib/activitypub/activity
Claire 993d0a9950 Merge commit '1e3b19230a48174acf524cf1a9f5a498e220ea7d' into glitch-soc/merge-upstream
Conflicts:
- `app/models/account.rb`:
  Upstream added new validations close to lines on which glitch-soc had
  modified validations to handle custom limits set through environment
  variables.
  Ported upstream changes.
- `config/initializers/content_security_policy.rb`:
  Upstream added `AZURE_ALIAS_HOST`. Glitch-soc's version of the file is
  completely different.
  Added `AZURE_ALIAS_HOST` to our version of the file.
2023-07-30 13:15:01 +02:00
..
accept_spec.rb
add_spec.rb
announce_spec.rb
block_spec.rb
create_spec.rb
delete_spec.rb
flag_spec.rb
follow_spec.rb
like_spec.rb
move_spec.rb
reject_spec.rb
remove_spec.rb
undo_spec.rb
update_spec.rb