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
..
chewy	Add basic search specs for chewy indexes (#24065)	2 years ago
config/initializers	Fix rack:attack flaky tests and test end of throttle period (#23799)	2 years ago
controllers	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
fabricators	Serializers spec coverage (#24017)	2 years ago
features	Autofix Rubocop RSpec/ImplicitSubject (#23721)	2 years ago
fixtures	Change domain block CSV parsing to be more robust and handle more lists (#21470)	2 years ago
helpers	Coverage improvement round-out following up previous work (#23987)	2 years ago
lib	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
mailers	User mailer spec coverage improvements (#23905)	2 years ago
models	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
policies	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
presenters	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
requests	Enable Style/FrozenStringLiteralComment for specs (#23790)	2 years ago
routing	Enable Style/FrozenStringLiteralComment for specs (#23790)	2 years ago
serializers	Serializers spec coverage (#24017)	2 years ago
services	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
support	Enable Style/FrozenStringLiteralComment for specs (#23790)	2 years ago
validators	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
views/statuses	Fix style for hashes (#20518)	2 years ago
workers	Coverage improvement round-out following up previous work (#23987)	2 years ago
fabricators_spec.rb	Fabricator specs (#23925)	2 years ago
rails_helper.rb	Add basic search specs for chewy indexes (#24065)	2 years ago
spec_helper.rb	Add policies and serializers groups to simplecov output (#23897)	2 years ago