Claire
c85616ee3a
Merge commit 'f79b96a5ef0f6c4f57eee7f44ce2579b28a22098' into glitch-soc/merge-upstream
...
Conflicts:
- `app/lib/feed_manager.rb`:
Not a real conflict, but glitch-soc has an extra `populate_direct_feed` method.
Added upstream's code.
- `app/models/user_settings.rb`:
Not a real conflict, glitch-soc has an extra setting textually-adjacent to a
setting added upstream.
Added upstream's setting.
- `app/serializers/initial_state_serializer.rb`:
Same.
- `app/services/precompute_feed_service.rb`:
Not a real conflict, glitch-soc has extra code for the direct feed.
Added upstream's new code for populating lists.
2025-02-01 19:07:13 +01:00
..
2025-01-22 08:35:41 +00:00
2025-01-22 08:35:41 +00:00
2025-01-27 08:39:56 +00:00
2025-01-22 08:35:41 +00:00
2025-01-06 08:13:39 +00:00
2025-01-22 08:35:41 +00:00
2025-01-27 08:39:56 +00:00
2025-01-22 08:35:41 +00:00
2025-01-22 08:35:41 +00:00
2025-01-22 08:35:41 +00:00
2025-01-30 08:52:04 +00:00
2025-01-22 08:35:41 +00:00
2025-01-22 08:35:41 +00:00
2025-01-28 09:40:50 +00:00
2025-01-22 08:35:41 +00:00
2025-01-30 08:52:04 +00:00
2025-01-30 08:52:04 +00:00
2025-01-27 08:39:56 +00:00
2025-01-27 08:39:56 +00:00
2025-01-29 11:37:56 +00:00
2025-01-30 08:52:04 +00:00
2025-01-30 08:52:04 +00:00
2025-01-30 08:52:04 +00:00
2025-01-30 08:52:04 +00:00
2025-01-27 08:39:56 +00:00
2025-01-31 08:09:02 +00:00
2025-01-27 08:39:56 +00:00
2025-01-30 08:52:04 +00:00
2025-01-22 08:35:41 +00:00
2025-01-30 08:52:04 +00:00
2025-01-31 08:09:02 +00:00
2025-01-31 08:09:02 +00:00
2025-01-30 08:52:04 +00:00
2025-01-22 08:35:41 +00:00
2025-01-22 08:35:41 +00:00
2025-01-30 08:52:04 +00:00
2023-10-31 16:05:44 +00:00
2025-01-30 08:52:04 +00:00
2025-01-22 08:35:41 +00:00
2025-01-22 08:35:41 +00:00
2025-01-30 08:52:04 +00:00
2025-01-22 08:35:41 +00:00
2025-01-23 13:36:03 +00:00
2025-01-22 08:35:41 +00:00
2025-01-22 08:35:41 +00:00
2025-01-22 08:35:41 +00:00
2023-06-02 15:00:27 +02:00
2024-09-11 13:59:46 +00:00
2025-01-22 08:35:41 +00:00
2025-01-30 08:52:04 +00:00
2025-01-27 08:39:56 +00:00
2025-01-24 09:06:25 +00:00
2025-01-22 08:35:41 +00:00
2025-01-23 13:36:03 +00:00
2025-01-22 08:35:41 +00:00
2025-01-22 08:35:41 +00:00
2025-01-28 09:40:50 +00:00
2025-01-22 08:35:41 +00:00
2025-01-22 08:35:41 +00:00
2025-01-22 08:35:41 +00:00
2025-01-22 08:35:41 +00:00
2023-07-13 14:22:20 +02:00
2025-01-31 08:09:02 +00:00
2025-01-22 08:35:41 +00:00
2025-01-22 08:35:41 +00:00
2025-01-22 08:35:41 +00:00
2025-01-22 08:35:41 +00:00
2025-01-22 08:35:41 +00:00
2025-01-22 08:35:41 +00:00
2025-01-20 08:59:23 +00:00
2025-01-13 09:13:47 +00:00
2025-01-30 08:52:04 +00:00
2025-01-30 08:52:04 +00:00
2025-01-22 08:35:41 +00:00
2025-01-22 08:35:41 +00:00
2025-01-22 08:35:41 +00:00
2025-01-23 13:36:03 +00:00
2025-01-22 08:35:41 +00:00
2025-01-31 08:09:02 +00:00
2025-01-22 08:35:41 +00:00
2025-01-22 08:35:41 +00:00
2024-12-02 08:27:19 +00:00
2025-01-22 08:35:41 +00:00
2025-01-22 08:35:41 +00:00
2025-01-22 08:35:41 +00:00
2025-01-22 08:35:41 +00:00
2025-01-31 08:09:02 +00:00
2025-01-22 08:35:41 +00:00
2025-01-30 08:52:04 +00:00
2025-01-22 08:35:41 +00:00
2025-01-22 08:35:41 +00:00
2025-01-24 09:06:25 +00:00
2025-01-22 08:35:41 +00:00
2025-01-22 08:35:41 +00:00
2025-01-22 08:35:41 +00:00
2025-01-22 08:35:41 +00:00
2025-01-22 08:35:41 +00:00
2023-12-05 16:07:53 +00:00
2025-01-27 08:39:56 +00:00
2025-01-30 08:52:04 +00:00
2025-01-22 08:35:41 +00:00
2025-01-22 08:35:41 +00:00
2025-01-30 08:52:04 +00:00
2025-01-22 08:35:41 +00:00
2025-01-22 08:35:41 +00:00
2025-01-31 08:09:02 +00:00
2025-01-22 08:35:41 +00:00
2025-01-30 08:52:04 +00:00
2025-01-22 08:35:41 +00:00
2025-01-30 08:52:04 +00:00