1
0
mirror of https://github.com/funamitech/mastodon synced 2024-12-14 06:38:39 +09:00
YuruToot/app/lib/activitypub
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
..
activity Merge branch 'main' into glitch-soc/merge-upstream 2023-04-29 10:44:56 +02:00
parser Merge branch 'main' into glitch-soc/merge-upstream 2023-02-19 10:42:55 +01:00
activity.rb Autofix Rubocop remaining Layout rules () 2023-02-20 06:58:28 +01:00
adapter.rb Compact JSON-LD signed incoming activities () 2022-02-03 14:07:29 +01:00
case_transform.rb Enable Rubocop Style/StringConcatenation defaults () 2023-02-22 09:54:36 +09:00
dereferencer.rb Remove instance variables from helper usage () 2023-04-23 22:35:54 +02:00
forwarder.rb Change sidekiq-bulk's batch size from 10,000 to 1,000 jobs in one Redis call () 2023-03-15 03:45:15 +01:00
linked_data_signature.rb Autofix Rubocop remaining Layout rules () 2023-02-20 06:58:28 +01:00
serializer.rb Fix ActivityPub context not being dynamically computed () 2019-09-03 22:52:32 +02:00
tag_manager.rb Autofix Rubocop remaining Layout rules () 2023-02-20 06:58:28 +01:00