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 f15ded319f 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
..
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	Autofix Rubocop Rails/RootPathnameMethods (#23760)	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