mastodon/lib/tasks
Claire 443ec4f8ba 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`
2021-11-25 23:50:35 +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
db.rake Fix typo in db.rake (#16126) 2021-04-27 16:25:24 +02:00
emojis.rake Update emoji codepoint mappings to v13.1 (#16352) 2021-06-03 16:08:07 +02:00
glitchsoc.rake
mastodon.rake Fix "bundle exec rails mastodon:setup" crashing in some circumstances (#16976) 2021-11-11 14:00:30 +01:00
repo.rake Add trending links (#16917) 2021-11-25 13:07:38 +01:00
statistics.rake