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 193250556c Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream changed their README, we have our own. Kept ours. - `app/helpers/application_helper.rb`: Minor code style fix upstream, on a line that is different in glitch-soc due to the different theming system. Applied the code style fix to our own code. - `app/views/settings/preferences/appearance/show.html.haml`: Code style fix on a line next to lines exclusive to glitch-soc. Applied upstream changes. - `yarn.lock`: Upstream updated a dependency textually close to a glitch-soc-only dependency. Updated the dependency like 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 Style/RedundantArgument (#23798)	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