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 392ca0472a Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/packs/admin.js`: Conflicts due to glitch-soc's theming system. Upstream changes have been ported to `app/javascript/core/admin.js` - `app/models/trends/statuses.rb`: Minor conflict due to glitch-soc's option to allow CWed toots in trends. Ported upstream changes.		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 null values being included in some indexes (#17711)	3 years ago
emojis.rake	Fix light-mode emoji borders. (#18131)	3 years ago
glitchsoc.rake	Add Rake task to backfill local-only flag (#253)	7 years ago
mastodon.rake	Change mastodon:webpush:generate_vapid_key task to not require functional env (#17338)	3 years ago
repo.rake	Remove language detection through cld3 (#17478)	3 years ago
statistics.rake	add task to report code statistics (#2489)	8 years ago
tests.rake	Fix instance actor being incorrectly created when running migrations (#18109)	3 years ago