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 3ef5f62abf 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
..
assets.rake	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
auto_annotate_models.rake	Autofix Rubocop remaining Layout rules (#23679)	2 years ago
branding.rake	Apply Rubocop Rails/RootPublicPath (#23447)	2 years ago
db.rake	Autofix Rubocop Style/RedundantBegin (#23703)	2 years ago
emojis.rake	Autofix Rubocop Rails/RootPathnameMethods (#23760)	2 years ago
glitchsoc.rake	Add Rake task to backfill local-only flag (#253)	7 years ago
mastodon.rake	Autofix Rubocop Rails/RootPathnameMethods (#23760)	2 years ago
repo.rake	Enable Rubocop Performance/DeleteSuffix (#24077)	2 years ago
statistics.rake	Audofix Rubocop Style/WordArray (#23739)	2 years ago
tests.rake	Fix pre-4.0 admin action logs (#22091)	2 years ago