Claire
f47e2937cf
Merge commit '0b66e744263a4af1f14d03886ea2a9da4ca156db' into glitch-soc/merge-upstream
2026-02-17 12:11:33 +01:00
Claire
0b66e74426
Add GET /api/v1/donation_campaigns ( #37880 )
2026-02-17 10:54:21 +00:00
Claire
4a6d17ad7b
Fix hashtag matching by replacing negative lookbehind with positive lookbehind ( #37684 )
2026-02-17 10:27:36 +00:00
Matt Jankowski
7f28dd1179
Use validation matchers for FollowLimitValidator spec ( #37792 )
2026-02-17 09:03:46 +00:00
Matt Jankowski
2cb8471d81
Update doorkeeper i18n for invalid code challenge method ( #37827 )
2026-02-17 09:01:59 +00:00
Claire
5769ceb6e3
Merge commit '284c53f4391c0e2cdea788bc0aff73190913a488' into glitch-soc/merge-upstream
2026-02-16 13:35:39 +01:00
Matt Jankowski
1b724e9e12
Capture output in cli/emoji spec ( #37861 )
2026-02-16 08:24:39 +00:00
Claire
5f72148834
Merge commit '56ecdde1523cec87c55d3d0e7e9b6757dcfe2491' into glitch-soc/merge-upstream
2026-02-13 18:26:08 +01:00
Matt Jankowski
56ecdde152
Add ContentPoliciesHelper#policy_list to wrap string building in views ( #37856 )
2026-02-13 15:54:41 +00:00
Claire
ddc7df2064
Merge commit '6c3bd944f8890e1a349bd06e9585cb5ec25507e6' into glitch-soc/merge-upstream
2026-02-13 13:03:51 +01:00
David Roetzel
6c3bd944f8
Allow reporting (local) Collections ( #37848 )
2026-02-13 11:11:44 +00:00
Claire
e451416d90
Merge commit 'c44cc1f5c3bafb49a324f8f72a42a91d09eecfe3' into glitch-soc/merge-upstream
2026-02-12 18:00:45 +01:00
David Roetzel
f57167c61a
Add ID/URI to collection items ( #37842 )
2026-02-12 15:31:45 +00:00
David Roetzel
37d859db29
Federate deletion of collection item ( #37837 )
2026-02-12 10:39:13 +00:00
Claire
37e82ee66f
Add --suspended-only option to tootctl emoji purge ( #37828 )
2026-02-12 10:25:29 +00:00
Claire
2373c5a132
Merge commit 'ca9966ce2ff79dcac90b2feced65fa991534d53e' into glitch-soc/merge-upstream
2026-02-11 20:26:56 +01:00
Claire
9129f98776
Process actor public keys when they are in a separate document without the ActivityStreams context ( #37826 )
2026-02-11 15:47:24 +00:00
Claire
dfe44bcaef
Add ability to require 2FA for specific roles (including Everybody) ( #37701 )
2026-02-11 14:34:09 +00:00
David Roetzel
3e1127d27b
Federate Add when item is added to Collection ( #37823 )
2026-02-11 13:52:29 +00:00
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
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
