Claire
4fbd1ad7ae
Merge commit 'd13d7b4566d551d027830f7dfc987ba3a8e2dd4f' into glitch-soc/merge-upstream
...
Conflicts are too numerous to list, but they are all caused by upstream's
theming changes and all have to do with the differences between upstream and
glitch-soc in the theming systems.
They were all manually resolved by adapting the relevant code.
2026-02-11 13:32:18 +01:00
Matt Jankowski
66b09318ed
Remove unneeded rescue from DOB Validator ( #37785 )
2026-02-10 16:24:23 +00:00
Claire
63aac77b61
Purge custom emojis on domain suspension ( #37808 )
2026-02-10 16:13:06 +00:00
Matt Jankowski
34514bcfe9
Move theme-related helper methods out of controller ( #37807 )
2026-02-10 15:34:42 +00:00
Claire
1b00b92772
Merge commit '2774e0fbfa045e883ec94e873e657e9e8fefa98b' into glitch-soc/merge-upstream
2026-02-10 12:03:53 +01:00
Claire
75ba314e6b
Migrate to new theming infrastructure ( #37612 )
2026-02-10 10:59:47 +00:00
Matt Jankowski
2774e0fbfa
Reduce stubbing SUT for EmailMxValidator spec ( #37750 )
2026-02-10 10:49:49 +00:00
David Roetzel
03f73377d9
Federate updates to collections ( #37790 )
2026-02-10 10:08:55 +00:00
Claire
c8db60f8d2
Merge commit '0b8ce7200aa3121d07aa3866ddfc99de3bcf319e' into glitch-soc/merge-upstream
2026-02-09 21:45:21 +01:00
Matt Jankowski
0b8ce7200a
Use validation matchers for ExistingUsernameValidator spec ( #37749 )
2026-02-09 15:24:31 +00:00
Claire
8f58c42ca3
Merge commit '2e30044a374811bc94fd62a8159cb2c9ffe18a4d' into glitch-soc/merge-upstream
2026-02-06 22:45:55 +01:00
Claire
5b24f4097d
Fix processing of object updates with duplicate hashtags ( #37756 )
2026-02-06 10:09:42 +00:00
Echo
7a4945c0d3
Show mute end date in badge ( #37747 )
2026-02-05 20:01:28 +00:00
Claire
55cd5e1ab1
Merge commit 'acdd0b33a3183569a2cdb50befdbba58f1e74ae9' into glitch-soc/merge-upstream
2026-02-05 17:57:46 +01:00
Matt Jankowski
af5ce5dad9
Use validation matchers for DomainValidator spec ( #37662 )
2026-02-05 15:55:31 +00:00
Claire
59e02a628d
Merge commit 'f652c54c3334890176331f62150559a96eeb41ae' into glitch-soc/merge-upstream
...
Conflicts:
- `app/services/backup_service.rb`:
Upstream refactored activity serialization while glitch-soc passed an extra argument.
Followed upstream's refactor, keeping our extra argument.
2026-02-05 12:43:12 +01:00
Matt Jankowski
f652c54c33
Update devise to version 5.0 ( #37419 )
2026-02-05 11:05:32 +00:00
David Roetzel
9cd94168b3
Federate Remove when collection is deleted ( #37741 )
2026-02-05 10:33:39 +00:00
Matt Jankowski
e82eb2b037
Convert admin/confirmations spec controller->request/system ( #37738 )
2026-02-05 10:04:10 +00:00
David Roetzel
73206856c5
Refactor activity serialization ( #37678 )
2026-02-05 09:39:27 +00:00
Claire
3bbc8ecf92
Merge commit '8ebe2e673e2fd175140df7275eb362c8eecfec31' into glitch-soc/merge-upstream
2026-02-04 19:23:24 +01:00
Claire
33dc4a6091
Merge commit '4f99b48e8e8c9818f85be1b2ac9abad75f538585' into glitch-soc/merge-upstream
2026-02-04 18:51:17 +01:00
Matt Jankowski
0d6fc8026d
Convert auth/confirmations spec controller->request ( #37735 )
2026-02-04 17:42:50 +00:00
Matt Jankowski
4f99b48e8e
Convert admin/accounts controller->request specs ( #37727 )
2026-02-04 10:42:34 +00:00
Claire
5b926157e8
Merge commit '6188de3efc293a6327cabcb858430aa79564dfd7' into glitch-soc/merge-upstream
2026-02-02 18:26:04 +01:00
David Roetzel
6188de3efc
Add ActivityPub serializer specs ( #37706 )
2026-02-02 16:47:42 +00:00
Matt Jankowski
9de54635ed
Add coverage for "too many IDs" scenario in api/v1/statuses ( #37699 )
2026-02-02 15:11:15 +00:00
Claire
d62a7775b5
Merge commit 'd0502ac3c1630e281fda5492cbc28390262b0aeb' into glitch-soc/merge-upstream
2026-01-29 21:08:46 +01:00
Daniel King and Daniel King
d5d57ac25a
Add flag to preserve cached media on cleanup ( #36200 )
...
Co-authored-by: Daniel King <git@kin.gy >
2026-01-29 15:53:51 +00:00
Claire
36be9bbebf
Merge commit 'a495a0cbfcf9f6111c0e598af0864de2b76e4111' into glitch-soc/merge-upstream
2026-01-28 19:29:10 +01:00
Matt Jankowski
f861a5cee0
Add action_logs association for account ( #36022 )
2026-01-28 11:04:00 +00:00
Claire
b14cbb3ee9
Merge pull request #3364 from ClearlyClaire/glitch-soc/features/local-only-drop-emoji
...
Deprecate eye emoji in favor of a bespoke API parameter
2026-01-27 22:30:17 +01:00
Claire
5a45a3203a
Merge commit '7af5ba271d6f04831f000e9b815914375e42abeb' into glitch-soc/merge-upstream
2026-01-27 18:03:27 +01:00
Claire
7af5ba271d
Fix error when encountering invalid tag in updated object ( #37635 )
2026-01-27 16:01:22 +00:00
Matt Jankowski
48c102aabe
Use validation matchers for DateOfBirthValidator spec ( #37631 )
2026-01-27 15:36:55 +00:00
Claire
9ea64fcb5a
Fix last_status_at not accurately tracking last status time for remote accounts ( #37619 )
2026-01-27 13:23:12 +00:00
Matt Jankowski
a28ccf2950
Use validation matchers for PollExpirationValidator spec ( #37616 )
2026-01-27 12:54:50 +00:00
David Roetzel
1d4c2c5670
Federate creation of collections ( #37618 )
2026-01-27 10:52:54 +00:00
Matt Jankowski
aa347708f5
Convert oauth/authorized_applications spec controller->request ( #37614 )
2026-01-27 10:44:24 +00:00
Matt Jankowski
604bed2930
Convert oauth/authorizations spec controller->request ( #37613 )
2026-01-27 10:20:25 +00:00
Matt Jankowski
634ff77d82
Convert settings/aliases spec controller->system ( #37617 )
2026-01-27 10:18:07 +00:00
Claire
73fc40993b
Fix filtering of mentions from filtered-on-their-origin-server accounts ( #37583 )
2026-01-27 09:53:21 +00:00
Claire
b96c8ecff4
Merge commit '89c1b9a8fdfe38881ad1b6c22f20240b087aa993' into glitch-soc/merge-upstream
2026-01-26 18:09:54 +01:00
Matt Jankowski
876ccfe0a3
Use Report#local? delegation more broadly ( #37596 )
2026-01-26 09:43:21 +00:00
Matt Jankowski
f7a2e5c715
Use validation matchers for InstanceModerationNote spec ( #37597 )
2026-01-26 09:42:55 +00:00
Claire
8b95254883
Merge commit 'c36db57acedf0033c090748125c665a0360cd11f' into glitch-soc/merge-upstream
2026-01-23 17:57:20 +01:00
Matt Jankowski
29ec2cd186
Add targeted_account_notes association to simplify usage ( #35540 )
2026-01-23 16:35:19 +00:00
David Roetzel
c5c70311d8
Return empty array when requesting collections of an account that blocked you ( #37591 )
2026-01-23 13:11:57 +00:00
David Roetzel
de63b61943
Change Collections API shape ( #37580 )
2026-01-23 10:22:37 +00:00
Shlee
1809048105
Safefy: Updated Admin::AccountDeletionWorker to match AccountDeletionWorker ( #37577 )
2026-01-22 16:01:44 +00:00
Claire
Matt Jankowski
David Roetzel
Echo
Daniel KingandDaniel King
Shlee