mastodon/app/lib/activitypub/activity
Claire 12b935fadf Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `.github/dependabot.yml`:
  Updated upstream, removed in glitch-soc to disable noise.
  Kept removed.
- `CODE_OF_CONDUCT.md`:
  Upstream updated to a new version of the covenant, but I have not read it
  yet, so kept unchanged.
- `Gemfile.lock`:
  Not a real conflict, one upstream dependency updated textually too close to
  the glitch-soc only `hcaptcha` dependency.
  Applied upstream changes.
- `app/controllers/admin/base_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/controllers/application_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/controllers/disputes/base_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/controllers/relationships_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/controllers/statuses_cleanup_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/helpers/application_helper.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/javascript/mastodon/features/compose/components/compose_form.jsx`:
  Upstream added a highlight animation for onboarding, while we changed the
  max character limit.
  Applied our local changes on top of upstream's new version.
- `app/views/layouts/application.html.haml`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `stylelint.config.js`:
  Upstream added ignore paths, glitch-soc had extra ignore paths.
  Added the same paths as upstream.
2023-04-29 10:44:56 +02:00
..
accept.rb Add support for private pinned posts (#16954) 2022-01-17 00:49:55 +01:00
add.rb Add featured tag add/remove activity handler (#19408) 2022-10-22 11:49:41 +02:00
announce.rb Fix Mastodon::RaceConditionError that occurs when external status is reblogged (#18424) 2022-05-16 01:00:09 +02: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 2023-04-29 10:44:56 +02:00
delete.rb Remove instance variables from helper usage (#24203) 2023-04-23 22:35:54 +02:00
flag.rb Remove instance variables from helper usage (#24203) 2023-04-23 22:35:54 +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 Add featured tag add/remove activity handler (#19408) 2022-10-22 11:49:41 +02:00
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 Remove instance variables from helper usage (#24203) 2023-04-23 22:35:54 +02:00