mastodon/lib/tasks
Claire 0ad919b192 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.js`:
  glitch-soc change because of having changed the default number of
  available poll options.
  Applied upstream's changes while keeping glitch-soc's default number of
  poll options.
- `public/oops.png`:
  We had a minor graphics change, probably not worth diverging from upstream.
  Took upstream version.
2022-11-06 09:50:41 +01:00
..
assets.rake Override current_user when generating static pages 2018-12-19 20:49:58 +01:00
auto_annotate_models.rake Add announcements (#12662) 2020-01-23 22:00:13 +01:00
branding.rake Fix wrong aspect ratio of logo in icons (#18639) 2022-06-11 20:32:02 +02:00
db.rake Fix null values being included in some indexes (#17711) 2022-03-12 08:12:57 +01:00
emojis.rake Add assets from Twemoji 14.0 (#19733) 2022-11-04 16:08:41 +01:00
glitchsoc.rake
mastodon.rake Fix mastodon:setup not setting the admin's role properly (#19670) 2022-11-02 16:35:21 +01:00
repo.rake Remove language detection through cld3 (#17478) 2022-02-08 02:41:17 +01:00
statistics.rake
tests.rake Fix admin action logs page (#19649) 2022-11-03 16:06:42 +01:00