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
..
2020-12-16 03:24:55 +01:00
2020-12-16 03:24:55 +01:00
2020-12-16 03:24:55 +01:00
2020-12-16 03:24:55 +01:00
2020-12-16 03:24:55 +01:00
2020-12-19 00:21:01 +01:00
2020-12-19 00:21:01 +01:00
2020-12-16 03:24:55 +01:00
2020-12-16 03:24:55 +01:00
2020-12-16 03:24:55 +01:00
2020-12-23 00:10:58 +01:00
2020-12-19 00:21:01 +01:00
2020-12-23 00:10:58 +01:00
2020-12-19 00:21:01 +01:00
2020-12-19 00:21:01 +01:00
2020-12-16 03:24:55 +01:00
2020-12-16 03:24:55 +01:00
2020-12-19 00:21:01 +01:00
2020-12-16 03:24:55 +01:00
2020-12-23 00:10:58 +01:00
2020-12-16 03:24:55 +01:00
2020-12-19 00:21:01 +01:00
2020-12-16 03:24:55 +01:00
2020-12-16 03:24:55 +01:00
2020-12-23 00:10:58 +01:00
2020-12-19 00:21:01 +01:00
2020-12-23 00:10:58 +01:00
2020-12-19 00:21:01 +01:00
2017-11-20 22:13:37 -08:00
2020-12-16 03:24:55 +01:00
2020-12-19 00:21:01 +01:00
2020-12-19 00:21:01 +01:00
2020-12-16 03:24:55 +01:00
2020-12-16 03:24:55 +01:00
2020-12-16 03:24:55 +01:00
2020-12-16 03:24:55 +01:00
2020-12-19 00:21:01 +01:00
2020-12-16 03:24:55 +01:00
2020-12-16 03:24:55 +01:00
2020-12-16 03:24:55 +01:00
2020-12-16 03:24:55 +01:00
2020-12-23 00:10:58 +01:00
2020-12-16 03:24:55 +01:00
2020-12-16 03:24:55 +01:00
2020-12-23 00:10:58 +01:00
2020-12-16 03:24:55 +01:00
2020-12-16 03:24:55 +01:00
2020-12-23 00:10:58 +01:00
2020-12-19 00:21:01 +01:00
2020-12-19 00:21:01 +01:00
2020-12-16 03:24:55 +01:00
2020-12-19 00:21:01 +01:00
2020-12-16 03:24:55 +01:00
2020-12-16 03:24:55 +01:00
2020-12-16 03:24:55 +01:00
2020-12-16 03:24:55 +01:00
2020-12-19 00:21:01 +01:00
2020-12-16 03:24:55 +01:00
2020-12-16 03:24:55 +01:00
2020-12-16 03:24:55 +01:00
2020-12-16 03:24:55 +01:00
2020-12-16 03:24:55 +01:00
2020-12-16 03:24:55 +01:00
2020-12-16 03:24:55 +01:00
2020-12-19 00:21:01 +01:00
2020-12-23 00:10:58 +01:00
2020-12-16 03:24:55 +01:00
2020-12-16 03:24:55 +01:00
2020-12-16 03:24:55 +01:00
2020-12-16 03:24:55 +01:00
2020-12-23 00:10:58 +01:00
2018-05-03 15:54:10 +02:00
2018-05-03 15:54:10 +02:00
2017-12-09 15:35:22 +01:00
2019-04-21 04:52:20 +02:00
2018-01-22 14:20:58 +01:00
2020-07-10 20:57:21 +02:00
2020-11-09 00:56:52 +01:00
2018-05-03 15:54:10 +02:00
2017-06-05 17:02:41 +02:00
2020-12-16 03:24:55 +01:00
2020-07-10 20:57:21 +02:00
2017-05-30 23:09:02 +02:00
2020-12-16 03:24:55 +01:00
2020-12-23 00:10:58 +01:00
2020-12-19 00:21:01 +01:00
2020-12-23 00:10:58 +01:00