Conflicts:
- `app/lib/activitypub/parser/status_parser.rb`:
Upstream refactored this class while glitch-soc had an additional method.
Moved the private methods as upstream did while keeping glitch-soc's extra one.
- `spec/lib/activitypub/activity/create_spec.rb`:
glitch-soc had extra tests.
Added upstream's new tests alongside the glitch-soc-specific ones.