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-06-11 18:55:03 +02:00
2025-06-10 08:17:35 +00:00
2025-06-24 06:54:55 +00:00
2025-05-23 06:43:02 +00:00
2024-11-18 14:58:45 +00:00
2024-10-31 15:12:08 +00:00
2024-10-31 15:12:08 +00:00
2024-11-15 18:44:32 +01:00
2024-06-11 08:50:51 +00:00
2024-06-11 08:50:51 +00:00
2025-03-28 09:20:32 +00:00
2024-05-24 17:13:34 +02:00
2024-11-04 10:11:06 +00:00
2024-11-22 14:43:16 +00:00
2025-01-07 16:28:54 +00:00
2024-10-28 13:32:56 +00:00
2024-06-21 15:32:49 +00:00
2025-03-26 19:14:26 +01:00
2025-01-16 11:10:08 +01:00
2024-11-14 13:47:29 +00:00
2025-06-18 09:54:17 +00:00
2025-05-28 09:39:55 +00:00
2024-06-18 12:16:16 +00:00
2025-02-07 21:21:28 +01:00
2025-03-03 16:50:57 +00:00
2025-05-05 12:33:31 +00:00
2024-09-18 09:27:43 +00:00
2025-01-22 14:02:05 +00:00
2024-11-22 08:00:14 +00:00
2024-09-25 13:35:37 +00:00
2025-03-18 14:50:41 +00:00
2024-06-27 07:16:59 +00:00
2025-05-26 15:32:41 +00:00
2025-06-10 08:17:35 +00:00
2024-06-06 07:30:10 +00:00
2024-11-18 09:37:01 +00:00
2025-06-02 09:27:08 +00:00
2025-06-06 07:32:24 +00:00
2025-05-30 13:20:51 +00:00
2024-11-22 15:58:48 +00:00
2024-11-08 10:08:36 +00:00
2025-06-18 09:54:17 +00:00
2025-06-12 20:32:25 +02:00
2024-10-23 13:32:18 +00:00
2025-03-04 13:28:33 +00:00
2025-05-30 07:00:33 +00:00
2025-06-10 08:17:35 +00:00