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
2018-12-01 17:39:13 +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:55:12 +01:00
2020-12-19 00:21:01 +01:00
2020-12-19 00:55:12 +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
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-19 00:55:12 +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:55:12 +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
2019-03-24 18:44:59 +01:00
2019-09-16 15:11:01 +02:00
2018-08-31 04:28:29 +02:00
2019-06-10 21:36:20 +02:00
2019-09-29 17:10:01 +02:00
2019-08-17 22:02:37 +02:00
2019-09-20 23:05:23 +02:00
2019-04-21 04:52:20 +02:00
2020-01-12 15:18:03 +01:00
2020-01-12 15:18:03 +01:00
2019-02-23 18:41:28 +01:00
2019-11-13 23:24:55 +01:00
2020-07-10 20:57:21 +02:00
2019-06-12 15:56:18 +02:00
2019-01-08 14:09:57 +01:00
2019-10-03 03:36:52 +02:00
2019-11-13 23:24:55 +01:00
2019-11-13 23:24:55 +01:00
2018-12-22 23:32:00 +01:00
2019-09-16 15:11:01 +02:00
2019-09-16 15:11:01 +02:00
2018-09-02 03:14:46 +02:00
2020-11-09 00:56:52 +01:00
2020-05-13 22:35:20 +02:00
2019-02-11 07:41:35 +01:00
2020-07-02 00:45:15 +02:00
2018-09-02 18:20:26 +02:00
2020-07-02 00:45:15 +02:00
2020-12-16 03:24:55 +01:00
2020-07-10 20:57:21 +02:00
2019-11-13 23:24:55 +01:00
2020-01-12 15:18:03 +01:00
2020-11-09 00:56:52 +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
537afa00f3