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 f39d9ab256 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.github/workflows/build-image.yml`: Upstream switched to pushing to both DockerHub and GitHub Container Repository, while glitch-soc was already pushing to the latter only. Updated our configuration to be slightly more consistent with upstream's naming and styling, but kept our behavior. - `Gemfile.lock`: Updated dependencies textually too close to glitch-soc only hcaptcha dependency. Updated dependencies as upstream did. - `README.md`: Upstream updated its README, but we have a completely different one. Kept our README, though it probably should be reworked at some point. - `app/views/auth/sessions/two_factor.html.haml`: Minor style fix upstream that's on a line glitch-soc removed because of its different theming system. Kept our file as is. - `spec/controllers/health_controller_spec.rb`: This file apparently did not exist upstream, upstream created it with different contents but it is functionally the same. Switched to upstream's version of the file. - `spec/presenters/instance_presenter_spec.rb`: Upstream changed the specs around `GITHUB_REPOSITORY`, while glitch-soc had its own code because it's a fork and does not have the same default source URL. Took upstream's change, but with glitch-soc's repo as the default case. - `yarn.lock`: Upstream dependencies textually too close to a glitch-soc only one. Updated dependencies as upstream did.		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	Refactor ActivityPub handling to prepare for non-Account actors (#19212)	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