mastodon/lib
Claire 537afa00f3 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/lib/feed_manager.rb`:
  Not a real conflict, glitch-soc-only DM-related method
  too close to changed upstream stuff.
  Ported upstream changes.
- `app/services/batched_remove_status_service.rb`:
  Additional logic in glitch-soc to clear DMs from timelines.
  Ported upstream changes and fixed the DM TL clearing logic.
- `app/workers/scheduler/feed_cleanup_scheduler.rb`:
  Additional code in glitch-soc to clear DM timelines.
  Ported upstream changes.
2020-12-23 01:47:45 +01:00
..
assets Add emoji autosuggest (#5053) 2017-09-23 14:47:32 +02:00
chewy/strategy Fix unnecessary queries when batch-removing statuses, 100x faster (#15387) 2020-12-22 17:13:55 +01:00
devise Fix authentication before 2FA challenge (#11943) 2019-09-24 04:35:36 +02:00
generators Add post-deployment migration system (#8182) 2018-08-13 18:17:20 +02:00
json_ld Fix preloaded JSON-LD context for identity not being used (#12138) 2019-10-10 06:48:53 +02:00
mastodon Merge branch 'master' into glitch-soc/merge-upstream 2020-12-23 01:47:45 +01:00
paperclip Add stoplight for object storage failures, return HTTP 503 (#13043) 2020-12-15 12:55:29 +01:00
redis Change Redis#exists calls to Redis#exists? to avoid deprecation warning (#14191) 2020-07-01 19:05:21 +02:00
tasks Merge branch 'master' into glitch-soc/merge-upstream 2020-12-23 01:47:45 +01:00
templates Add post-deployment migration system (#8182) 2018-08-13 18:17:20 +02:00
webpacker Add subresource integrity for JS and CSS assets (#15096) 2020-11-06 11:56:31 +01:00
cli.rb Deal with collation-related index corruption (#14860) 2020-11-19 17:37:49 +01:00