Claire
3a31ef11cc
Merge commit 'db0cd9489c70e985da961a585f3a809ca449dccf' into glitch-soc/merge-upstream
...
Conflicts:
- `app/services/post_status_service.rb`:
Upstream updated the logic to move the CW to the text content.
Glitch-soc does not move CW to text content but has some logic
to avoid the text being empty. Update the logic according to upstream's
change.
- `docker-compose.yml`:
Conflict because of different paths for composer images.
Updated version as upstream did while keeping our path.
2025-09-17 20:10:28 +02:00
..
2025-09-15 15:03:44 +00:00
2025-03-27 07:48:19 +00:00
2024-08-19 15:59:06 +00:00
2025-06-30 07:42:34 +00:00
2024-11-19 10:04:12 +00:00
2024-03-26 14:46:38 +00:00
2024-08-06 10:07:16 +00:00
2025-03-14 14:07:29 +00:00
2023-11-06 15:53:29 +00:00
2024-09-24 15:19:55 +00:00
2025-02-18 20:38:57 +01:00
2025-03-07 13:15:10 +01:00
2025-06-10 08:17:35 +00:00
2024-03-26 14:46:38 +00:00
2025-08-12 08:15:22 +00:00
2023-09-05 15:37:23 +02:00
2023-11-30 13:30:35 +00:00
2025-04-25 15:12:05 +00:00
2025-07-03 07:28:03 +00:00
2024-08-07 15:14:37 +00:00
2025-09-11 16:32:55 +00:00
2023-12-19 10:59:43 +00:00
2025-05-22 12:42:16 +00:00
2024-09-08 18:41:37 +00:00
2025-06-10 08:17:35 +00:00
2025-07-28 08:26:29 +00:00
2025-08-25 15:44:18 +00:00
2025-09-17 20:10:28 +02:00
2025-05-28 18:41:47 +02:00
2024-11-06 10:51:54 +00:00
2024-12-11 12:59:29 +00:00
2024-10-02 12:26:16 +00:00
2024-01-15 20:06:31 +01:00
2024-11-19 10:04:12 +00:00
2025-04-25 15:12:05 +00:00
2025-08-01 22:11:59 +02:00
2024-07-16 13:23:08 +00:00
2024-10-01 09:54:42 +00:00
2025-09-11 09:37:56 +00:00
2025-06-30 07:42:34 +00:00
2024-11-14 14:03:57 +00:00
2024-05-24 13:13:23 +00:00
2025-06-12 08:53:02 +00:00
2024-05-24 13:13:23 +00:00
2024-10-15 13:26:20 +00:00
2024-11-08 10:00:15 +00:00
2025-07-28 08:26:29 +00:00
2025-07-28 08:26:29 +00:00
2025-06-12 08:53:02 +00:00
2023-12-15 15:52:00 +00:00
2025-06-12 08:53:02 +00:00
2025-08-06 22:02:55 +02:00
2024-11-21 14:37:25 +00:00
2024-01-23 11:41:34 +00:00