You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Claire 498de92bc8 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.		2 years ago
..
activity	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
parser	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
activity.rb	Autofix Rubocop remaining Layout rules (#23679)	2 years ago
adapter.rb	Compact JSON-LD signed incoming activities (#17426)	3 years ago
case_transform.rb	Enable Rubocop Style/StringConcatenation defaults (#23792)	2 years ago
dereferencer.rb	Remove instance variables from helper usage (#24203)	2 years ago
forwarder.rb	Change sidekiq-bulk's batch size from 10,000 to 1,000 jobs in one Redis call (#24034)	2 years ago
linked_data_signature.rb	Autofix Rubocop remaining Layout rules (#23679)	2 years ago
serializer.rb	Fix ActivityPub context not being dynamically computed (#11746)	5 years ago
tag_manager.rb	Autofix Rubocop remaining Layout rules (#23679)	2 years ago