Thibaut Girka
9748f074a3
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/api/v1/timelines/public_controller.rb
- app/lib/feed_manager.rb
- app/models/status.rb
- app/services/precompute_feed_service.rb
- app/workers/feed_insert_worker.rb
- spec/models/status_spec.rb
All conflicts are due to upstream refactoring feed management and us having
local-only toots on top of that. Rewrote local-only toots management for
upstream's changes.
2020-09-08 16:26:47 +02:00
..
2020-06-29 13:56:55 +02:00
2020-06-03 08:33:30 +02:00
2020-06-02 19:24:53 +02:00
2020-07-26 23:58:36 +02:00
2020-07-13 19:33:10 +02:00
2020-09-08 03:41:16 +02:00
2020-07-15 21:08:19 +02:00
2019-10-03 17:50:59 +02:00
2019-07-06 23:26:16 +02:00
2020-06-09 10:39:20 +02:00
2017-04-11 19:31:22 +02:00
2020-05-13 22:11:49 +02:00
2020-06-09 10:32:00 +02:00
2019-07-15 00:48:50 +02:00
2019-12-16 23:55:50 +01:00
2020-06-09 10:32:00 +02:00
2020-06-02 19:24:53 +02:00
2020-09-01 17:02:18 +02:00
2019-07-06 23:26:16 +02:00
2020-09-01 03:04:00 +02:00
2019-12-18 16:56:06 +01:00
2019-12-18 16:54:03 +01:00
2020-04-25 22:01:08 +02:00
2020-03-08 15:17:39 +01:00
2020-06-09 10:26:58 +02:00
2019-09-29 16:23:13 +02:00
2018-10-07 23:44:58 +02:00
2020-09-08 03:41:16 +02:00
2020-03-27 22:28:39 +01:00
2020-09-08 16:26:47 +02:00
2019-07-28 05:59:51 +02:00
2020-07-24 11:26:40 +02:00
2020-06-09 10:39:20 +02:00
2019-07-06 23:26:16 +02:00
2020-05-13 22:11:49 +02:00
2019-06-04 23:11:18 +02:00
2020-06-09 10:26:58 +02:00
2020-03-12 23:06:43 +01:00
2020-05-14 23:37:37 +02:00
2019-09-11 16:32:44 +02:00
2019-09-28 01:02:21 +02:00
2020-07-15 21:08:19 +02:00
2019-08-07 20:20:23 +02:00
2019-07-06 23:26:16 +02:00
2019-07-06 23:26:16 +02:00
2019-09-17 08:44:45 +02:00
2017-03-02 18:49:32 +01:00
2020-09-01 03:04:00 +02:00
2019-01-24 15:38:18 +01:00
2020-01-12 14:17:03 +01:00