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 784e38f70b Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/views/admin/tags/index.html.haml`: Removed upstream while it had changes in glitch-soc to accomodate for the theming system. Additional changes to accomodate for the theming system: - `app/views/admin/trends/links/preview_card_providers/index.html.haml` - `app/views/admin/trends/links/index.html.haml` - `app/views/admin/trends/tags/index.html.haml` - `app/views/admin/tags/show.html.haml`		3 years ago
..
assets.rake	Override current_user when generating static pages	6 years ago
auto_annotate_models.rake	Add announcements (#12662)	5 years ago
db.rake	Fix typo in db.rake (#16126)	3 years ago
emojis.rake	Update emoji codepoint mappings to v13.1 (#16352)	3 years ago
glitchsoc.rake	Add Rake task to backfill local-only flag (#253)	7 years ago
mastodon.rake	Fix "bundle exec rails mastodon:setup" crashing in some circumstances (#16976)	3 years ago
repo.rake	Add trending links (#16917)	3 years ago
statistics.rake	add task to report code statistics (#2489)	8 years ago