catstodon/lib/tasks
Thibaut Girka 3fefb7909b Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `config/webpack/shared.js`:
  Upstream has changed how Tesseract.js gets included and dropped a dependency.
  The conflict is caused by glitch-soc having different code due to its
  theming system.
  Ported upstream changes.
- `lib/mastodon/version.rb`:
  Upstream refactor/code style change in a place we replaced upstream's
  repo URL with ours.
  Ported upstram changes, keeping our repo URL.
- `yarn.lock`:
  Upstream dropped dependencies, one of which was textually too close to
  a glitch-soc-specific dependency. Not a real conflict.
2020-09-01 17:02:18 +02: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 low-hanging rubocop gripes (#8458) 2018-08-26 19:22:46 +02:00
emojis.rake Add border around 🐞 emoji (#14712) 2020-08-31 23:30:27 +02:00
glitchsoc.rake Add Rake task to backfill local-only flag (#253) 2017-12-10 22:49:59 -06:00
mastodon.rake Fix mastodon:setup choking on env variables containing '%' (#13940) 2020-06-03 20:18:52 +02:00
repo.rake Add missing locale file for ga and add rake task to check for it (#11813) 2019-09-12 04:58:33 +02:00
statistics.rake add task to report code statistics (#2489) 2017-04-26 18:47:22 +02:00