Matt Jankowski
0c75e97345
Use JSON.generate in backup service ( #38234 )
2026-03-16 15:10:10 +00:00
Matt Jankowski
c05492ed5a
Use JSON.generate call for fan out service ( #38222 )
2026-03-16 14:31:58 +00:00
Matt Jankowski
330357507d
Use to_json call for webhook service ( #38217 )
2026-03-16 14:01:37 +00:00
Matt Jankowski
6044219746
Use to_json call for raw event strings ( #38215 )
2026-03-16 13:55:58 +00:00
Claire
4359098740
Merge commit '9c8be1e72146af247e2b6cdae6e1d37371506569' into glitch-soc/merge-upstream
2026-03-16 12:17:49 +01:00
David Roetzel
12c63a382c
Handle adding already approved collection items ( #38213 )
2026-03-16 10:35:07 +00:00
Claire
3833eadfbf
Merge commit 'adede83c7c9a943cf9954fe865becf6a0c2d2280' into glitch-soc/merge-upstream
2026-03-12 18:48:32 +01:00
David Roetzel
84d8020165
Store a remote actor's featuredCollections URI ( #38166 )
2026-03-12 09:11:32 +00:00
Claire
b5222606e3
Merge commit '811575a10903cada549580979cc809ca98ad570c' into glitch-soc/merge-upstream
2026-03-11 18:50:59 +01:00
David Roetzel
3091e2e525
Ingestion of remote collections ( #38144 )
2026-03-11 14:29:00 +00:00
Claire
8d717ab161
Merge commit '1d46558e8d949860acc4f3a86516b9989bd74f79' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/controllers/application_controller_spec.rb`:
Upstream moved specs that were textually-adjacent to glitch-soc ones.
Kept the glitch-soc ones.
2026-03-09 18:14:15 +01:00
David Roetzel
1d46558e8d
Ingestion of remote collection items ( #38106 )
2026-03-09 14:59:57 +00:00
Claire
0a989af8c6
Merge commit '3d8d5f6dc7625d9638cc2e3387247442225d4e3f' into glitch-soc/merge-upstream
2026-03-05 18:21:07 +01:00
Claire
9b4a09f760
Fix poll expiration notification being re-triggered on implicit updates ( #38078 )
2026-03-05 14:53:00 +00:00
Claire
922fbb8c17
Add for searching already-known private GtS posts ( #38057 )
2026-03-05 08:56:18 +00:00
Claire
c96db36396
Merge commit '8a0261c51caf76b6d12e3801da471759c31c9608' into glitch-soc/merge-upstream
2026-03-04 12:40:16 +01:00
Claire
8a0261c51c
Add missing_attribution boolean to preview cards ( #38043 )
2026-03-04 11:18:37 +00:00
Claire
5472ab251a
Fix existing posts not being removed from lists when a list member is unfollowed ( #38048 )
2026-03-04 11:18:28 +00:00
Claire
799bd69189
Merge commit '2f657019201d73c9d86d1ece339e66e72954f0eb' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/admin/custom_emojis/new.html.haml`:
Upstream refactored a line adjacent to a glitch-soc modified line.
Ported upstream changes.
2026-03-02 12:19:02 +01:00
David Roetzel
2f65701920
Add service to revoke inclusion in a Collection ( #38026 )
2026-03-02 10:16:41 +00:00
Shlee
6ab24de659
trustworthy_attribution - Bounce bad URIs ( #37372 )
2026-03-02 10:03:21 +00:00
Claire
0e1ea3110e
Merge commit '7f16397f3c37a8e378239974b73afbfe2b6e6844' into glitch-soc/merge-upstream
...
Conflicts:
- `lib/mastodon/version.rb`:
Upstream bumped the mastodon API version, glitch-soc has a change on an adjacent
line adding a glitch API version.
2026-02-27 21:25:37 +01:00
Matt Jankowski
7e5e96739f
Use consistent calling style for TagManager#normalize_domain ( #35764 )
2026-02-27 16:38:34 +00:00
Matt Jankowski
9762b4a75c
Use normalizes for tag name attribute ( #37119 )
2026-02-27 15:56:08 +00:00
Claire
dc27eccc8e
Merge commit 'bca57020a04c552a3c91912a0e0b69ddafaad06a' into glitch-soc/merge-upstream
2026-02-26 18:27:02 +01:00
David Roetzel
b09e63da87
Federate activity when remote account is added to a Collection ( #37992 )
2026-02-26 15:11:02 +00:00
Claire
b041869887
Merge commit '3df8fb8fe9d33c7fbe51aa0a418b8b9ca46bb61b' into glitch-soc/merge-upstream
2026-02-18 18:40:03 +01:00
Nicholas La Roux
438602c488
Upgrade rubocop from v1.84.0 to v1.84.2, update config, and correct offences ( #37795 )
2026-02-17 14:56:46 +00:00
Claire
02ad266b81
Merge commit 'cff25c186bb8bb7cdd29de8938949c775dc0ec7f' into glitch-soc/merge-upstream
2026-02-16 18:27:08 +01:00
Claire
cff25c186b
Fix race condition when processing statuses twice with the same idempotency key ( #37879 )
2026-02-16 14:58:22 +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
37d859db29
Federate deletion of collection item ( #37837 )
2026-02-12 10:39:13 +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
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
Claire
63aac77b61
Purge custom emojis on domain suspension ( #37808 )
2026-02-10 16:13:06 +00:00
Claire
040555be7f
Fix NoMethodError in ActivityPub::FetchFeaturedTagsCollectionService ( #37806 )
2026-02-10 15:24:54 +00:00
David Roetzel
ae30c40335
Auto accept account added to collection ( #37805 )
2026-02-10 12:48:28 +00:00
Claire
1b00b92772
Merge commit '2774e0fbfa045e883ec94e873e657e9e8fefa98b' into glitch-soc/merge-upstream
2026-02-10 12:03:53 +01: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
Jonny Saunders
e17bbed88f
Change: Consolidate collection handling in jsonld helper ( #34595 )
2026-02-09 15:19:36 +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
Claire
55cd5e1ab1
Merge commit 'acdd0b33a3183569a2cdb50befdbba58f1e74ae9' into glitch-soc/merge-upstream
2026-02-05 17:57:46 +01:00
Shlee
ecdc7ff3f9
Add defensive check to AfterUnallowDomainService ( #37744 )
...
Co-authored-by: Your Name <you@example.com>
2026-02-05 14:13:56 +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