luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-17 04:13:01 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/spec/lib/activitypub
History
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
..
activity Merge commit '1e3b19230a48174acf524cf1a9f5a498e220ea7d' into glitch-soc/merge-upstream 2023-07-30 13:15:01 +02:00
adapter_spec.rb Fix Lint/ConstantDefinitionInBlock cop (#24763) 2023-05-03 10:32:30 +02:00
dereferencer_spec.rb Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
linked_data_signature_spec.rb Add stricter protocol fields validation for accounts (#25937) 2023-07-20 18:23:48 +02:00
tag_manager_spec.rb Add stricter protocol fields validation for accounts (#25937) 2023-07-20 18:23:48 +02:00