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 7452a95998 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.github/dependabot.yml`: Upstream made changes while we have dropped this file. Keep the file deleted. - `.prettierignore`: Upstream made changes at the end of the file, where we had our extra lines. Just moved our extra lines back at the end. - `app/serializers/initial_state_serializer.rb`: Upstream code style changes. Applied them. - `app/services/backup_service.rb`: Upstream code style changes. Applied them.		2 years ago
..
config/initializers	Autofix Rubocop Style/EmptyLambdaParameter (#23705)	2 years ago
controllers	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
fabricators	Autofix Rubocop Style/StringLiterals (#23695)	2 years ago
features	Autofix Rubocop Style/StringLiterals (#23695)	2 years ago
fixtures	Change domain block CSV parsing to be more robust and handle more lists (#21470)	2 years ago
helpers	Autofix Rubocop RSpec/EmptyLineAfterHook (#23718)	2 years ago
lib	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
mailers	Autofix Rubocop Style/StringLiterals (#23695)	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	Autofix Rubocop Style/StringLiterals (#23695)	2 years ago
routing	Enable Rubocop RSpec/MultipleDescribes (#23672)	2 years ago
serializers	Run rubocop formatting except line length (#23632)	2 years ago
services	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
support	Autofix Rubocop Style/IfUnlessModifier (#23697)	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	Autofix Rubocop Style/TrailingCommaInArrayLiteral (#23692)	2 years ago
rails_helper.rb	Autofix Rubocop Style/StringLiterals (#23695)	2 years ago
spec_helper.rb	Autofix Rubocop Style/StringLiterals (#23695)	2 years ago