Claire
93bdb16817
Merge commit '8ba1487f30685fff4555a7537d3e6c765c73a07c' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/models/concerns/account/interactions_spec.rb`:
Conflict due to glitch-soc having modified specs ages ago.
The covered code is the same as upstream, though.
Took upstream's version of the specs.
- `spec/models/status_spec.rb`:
Conflict because glitch-soc tests for an extra glitch-soc-specific
method.
Added upstream's changes while keeping the glitch-soc method.
2025-06-24 22:43:43 +02:00
..
2025-01-03 08:28:14 +00:00
2025-06-24 07:40:24 +00:00
2025-01-07 16:28:54 +00:00
2025-05-16 12:24:02 +00:00
2025-01-08 08:48:45 +00:00
2025-01-13 14:27:30 +00:00
2024-12-10 13:02:52 +00:00
2025-06-24 07:40:24 +00:00
2024-12-17 16:25:02 +00:00
2025-01-06 08:18:05 +00:00
2025-01-09 15:08:39 +00:00
2025-01-09 15:08:39 +00:00
2025-06-12 14:54:00 +00:00
2024-11-12 08:57:06 +00:00
2025-04-24 14:56:13 +00:00
2024-10-25 08:42:14 +00:00
2025-04-25 15:12:05 +00:00
2024-11-24 16:46:28 +01:00
2025-06-12 14:54:00 +00:00
2025-04-24 14:56:13 +00:00
2025-04-24 14:56:13 +00:00
2024-11-13 10:22:11 +00:00
2025-04-24 14:56:13 +00:00
2025-05-30 11:54:25 +00:00
2024-12-10 15:45:13 +00:00
2025-04-24 14:56:13 +00:00
2025-04-24 14:56:13 +00:00
2025-04-24 14:56:13 +00:00
2025-04-24 14:56:13 +00:00
2025-06-16 13:12:23 +00:00
2024-12-12 09:09:35 +00:00
2025-05-21 16:22:54 +00:00
2025-06-24 07:44:50 +00:00
2025-04-24 14:56:13 +00:00
2025-01-06 18:23:57 +00:00
2024-10-28 07:34:58 +00:00
2025-06-24 22:43:43 +02:00
2025-04-24 14:56:13 +00:00
2025-04-24 14:56:13 +00:00
2025-04-24 14:56:13 +00:00
2025-06-21 08:59:47 +00:00
2024-10-31 13:27:47 +00:00
2024-12-19 08:10:39 +00:00
2025-05-21 15:20:17 +00:00
2025-06-20 10:04:14 +00:00
2025-06-20 10:05:24 +00:00