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 4ed09276d5 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.prettierignore`: Upstream added a line at the end of the file, while glitch-soc had its own extra lines. Took upstream's change. - `CONTRIBUTING.md`: We have our custom CONTRIBUTING.md quoting upstream. Upstream made changes. Ported upstream changes. - `app/controllers/application_controller.rb`: Upstream made code style changes in a method that is entirely replaced in glitch-soc. Ignored the change. - `app/models/account.rb`: Code style changes textually close to glitch-soc-specific changes. Ported upstream changes. - `lib/sanitize_ext/sanitize_config.rb`: Upstream code style changes. Ignored them.		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	Autofix Rubocop Rails/RootPathnameMethods (#23760)	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	Fix mispelled spec filenames (#23834)	2 years ago
lib	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
mailers	Enable Style/FrozenStringLiteralComment for specs (#23790)	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	Rename ActivityPub Serializer Specs (#23844)	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	Change auto-deletion throttling constants to better scale with server size (#23320)	2 years ago
rails_helper.rb	Autofix Rubocop Rails/RootPathnameMethods (#23760)	2 years ago
spec_helper.rb	Enable Style/FrozenStringLiteralComment for specs (#23790)	2 years ago