1
0
mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00
mastodon/lib/tasks
Claire f8d867bac4 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/services/remove_status_service.rb`:
  Conflict caused by us having a distinc Direct timeline.
  Ported upstream changes.
- `app/javascript/mastodon/features/compose/components/compose_form.js`:
  Conflict between glitch-soc's variable character limit and upstream
  refactoring that part of the code.
  Ported upstream changes.
2020-12-05 17:33:37 +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 () 2020-01-23 22:00:13 +01:00
db.rake Fix post-migration warning about index corruption being too scary () 2020-11-27 15:41:43 +01:00
emojis.rake Add border around 🕺 emoji () 2020-09-10 19:08:03 +02:00
glitchsoc.rake Add Rake task to backfill local-only flag () 2017-12-10 22:49:59 -06:00
mastodon.rake Fix mastodon:setup choking on env variables containing '%' () 2020-06-03 20:18:52 +02:00
repo.rake Add missing locale file for ga and add rake task to check for it () 2019-09-12 04:58:33 +02:00
statistics.rake add task to report code statistics () 2017-04-26 18:47:22 +02:00