mastodon/app/lib/activitypub/activity
Claire aaa9ec340b Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/lib/formatter.rb`:
  Upstream completely refactored the formatting code and removed that file,
  while glitch-soc had code for Markdown and HTML toots.
  Took upstream code, glitch-soc changes will be re-implemented on top of the
  refactored classes in a later commit.
- `app/models/status.rb`:
  Upstream refactored status edit handling and moved code to
  `app/models/concerns/status_snapshot_concern.rb`.
  Applied glitch-soc's changes to that file.
- `app/serializers/activitypub/note_serializer.rb`:
  Not really a conflict, just a line added too close to one modified by
  glitch-soc.
  Applied upstream changes while keeping the glitch-soc-modified one.
- `app/services/update_status_service.rb`:
  Not really a conflict, upstream modified a line adjacent to one added by
  glitch-soc.
  Applied upstream changes while keeping the glitch-soc line.
- `app/views/statuses/_simple_status.html.haml`:
  Upstream refactored formatting, glitch-soc changed the markup slightly.
  Applied upstream changes.
- `spec/lib/formatter_spec.rb`:
  Upstream completely refactored the formatting code and removed that file,
  while glitch-soc had code for Markdown and HTML toots.
  Took upstream code, glitch-soc changes will be re-implemented on top of the
  refactored classes in a later commit.
2022-03-26 19:18:55 +01:00
..
accept.rb Add support for private pinned posts (#16954) 2022-01-17 00:49:55 +01:00
add.rb Add support for private pinned posts (#16954) 2022-01-17 00:49:55 +01:00
announce.rb Fix duplicate notifications being possible after poll expiration (#17697) 2022-03-04 01:06:33 +01:00
block.rb Fix processing of incoming Block activities (#15546) 2021-01-12 09:25:01 +01:00
create.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-03-26 19:18:55 +01:00
delete.rb Fix status updates not being forwarded like deletes through ActivityPub (#17648) 2022-02-26 17:51:59 +01:00
flag.rb Fix reports of already suspended accounts being recorded (#16047) 2021-04-16 22:01:05 +02:00
follow.rb Fix duplicate notifications being possible after poll expiration (#17697) 2022-03-04 01:06:33 +01:00
like.rb Fix duplicate notifications being possible after poll expiration (#17697) 2022-03-04 01:06:33 +01:00
move.rb Fix race conditions on account migration creation (#15597) 2021-02-02 14:49:57 +01:00
reject.rb Fix handling of Reject Follow when a matching follow relationship exists (#14479) 2020-08-01 18:20:37 +02:00
remove.rb
undo.rb Fix not handling Undo on some activity types when they aren't inlined (#14346) 2020-07-22 11:45:35 +02:00
update.rb Fix searching already-known converted activities by URL (#17814) 2022-03-17 00:46:49 +01:00