Claire
3d8e40f7c9
Merge commit 'c72ca33fac1ae1518371f5954ae9487692b17709' into glitch-soc/merge-upstream
2026-03-24 17:05:53 +01:00
David Roetzel
7788281759
Fix adding items without a position ( #38368 )
2026-03-24 14:43:50 +00:00
Claire
4559e4ed1a
Merge commit from fork
2026-03-24 15:44:08 +01:00
Claire
60236bffe6
Merge commit '0ef43a431d353a17419ea6664ed745b5dbfbf2f9' into glitch-soc/merge-upstream
2026-03-24 12:13:39 +01:00
Matt Jankowski
0ef43a431d
Skip non-collection urls in process links service ( #38351 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com >
2026-03-24 09:52:35 +00:00
Claire
ca08c040b0
Federate new profile settings ( #38314 )
2026-03-24 09:20:17 +00:00
David Roetzel
e4e584a99e
Handle Update of a FeaturedCollection ( #38337 )
2026-03-23 15:57:02 +00:00
David Roetzel
3c47020f93
Allow service to update existing Collections ( #38329 )
2026-03-23 14:09:10 +00:00
Claire
39d9da3b82
Tag linked FeaturedCollection objects over ActivityPub ( #38115 )
2026-03-23 13:11:33 +00:00
Claire
21576e29ab
Refactor ProcessMentionsService to remove save_records parameter ( #38277 )
2026-03-23 09:12:30 +00:00
Claire
469076c357
Merge commit '4e276e4476c81482143440f1f405479e0e4be7eb' into glitch-soc/merge-upstream
2026-03-20 18:03:14 +01:00
Matt Jankowski
24d3c94f4a
Use delegate in web/push_subscription model for token value ( #38313 )
2026-03-20 15:48:28 +00:00
David Roetzel
7aa696149f
Fetch an actor's featured collections ( #38306 )
2026-03-20 15:34:04 +00:00
Claire
8f9eba9629
Add more tests around terminating streaming connections ( #38301 )
2026-03-20 10:00:30 +00:00
David Roetzel
ccf6f16f05
Handle Delete of a FeatureAuthorization ( #38292 )
2026-03-20 09:51:20 +00:00
Claire
291f141a02
Merge commit '1ee457f2d37c2b77a7fbce246a7c72ac9f9d3056' into glitch-soc/merge-upstream
2026-03-19 18:14:55 +01:00
Claire
1ee457f2d3
Split invite_users permission into invite_bypass_approval ( #38278 )
2026-03-19 15:25:54 +00:00
David Roetzel
f43969a0eb
New service to fetch remote collections ( #38298 )
2026-03-19 14:27:02 +00:00
Claire
842bac86f6
Merge commit 'db074fc3e2b671e28a44ae379e6df1fcbdbbce53' into glitch-soc/merge-upstream
2026-03-18 18:01:57 +01:00
Matt Jankowski
815c2cf8e9
Clean up Webfinger lib spec ( #38259 )
2026-03-18 13:23:06 +00:00
Matt Jankowski
bd9b24f1ef
Prefer rspec-sidekiq matchers over "expect push bulk to match" approach ( #38274 )
2026-03-18 13:21:54 +00:00
Matt Jankowski
e537292e2a
Prefer to_json in self destruct scheduler ( #38263 )
2026-03-18 13:21:03 +00:00
Claire
2b0531914f
Merge commit 'd52d0e4dedcc4c8ca12781681debe68f77c007e2' into glitch-soc/merge-upstream
2026-03-18 12:01:23 +01:00
Matt Jankowski
b497bb2908
Normalize current_username on account redirect form ( #38262 )
2026-03-18 09:33:00 +00:00
Matt Jankowski
e839a94b93
Use with_index iterator in backup service ( #38264 )
2026-03-18 09:11:14 +00:00
Claire
3593ddff11
Merge commit 'b320c9e4c901bf99ccbca321bad2ceb2f51de140' into glitch-soc/merge-upstream
2026-03-17 18:58:19 +01:00
Claire
bd9e7d6060
Merge commit '68984de5b503791b814d81a85520af256bf43e11' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/admin/settings/discovery/show.html.haml`:
Glitch-soc has an extra setting textually adjacent to a line upstream has changed.
Applied upstream's change while keeping glitch-soc's setting.
2026-03-17 18:53:00 +01:00
Claire
04bf07a9cf
Merge commit 'c37bc5a8a94758e19b2d50db5e7816a96cec5cf4' into glitch-soc/merge-upstream
2026-03-17 18:01:07 +01:00
Matt Jankowski
b320c9e4c9
Prefer to_json over JSON.generate when simple strings in stub request ( #38258 )
2026-03-17 16:10:54 +00:00
David Roetzel
f3035a8e51
Handle Reject of a FeatureRequest ( #38256 )
2026-03-17 15:59:51 +00:00
Matt Jankowski
9c4a072adf
Add missing require rails helper to recent moved files ( #38254 )
2026-03-17 15:16:32 +00:00
David Roetzel
96c93ba835
Only persist a collection item's approval URI once it is verified ( #38255 )
2026-03-17 15:14:30 +00:00
Matt Jankowski
b9d25bde3e
Convert mix of JSON.parse and JSON.load_file ( #38242 )
2026-03-17 13:27:57 +00:00
Matt Jankowski
4d33490ec8
Update chewy to version 8.0.1 ( #37983 )
2026-03-17 13:27:37 +00:00
David Roetzel
5f36c482d2
Handle Accept of a FeatureRequest ( #38251 )
2026-03-17 11:45:00 +00:00
diondiondion
68984de5b5
Revamp heading levels in settings & admin pages ( #38230 )
2026-03-17 10:32:24 +00:00
Matt Jankowski
c37bc5a8a9
Update model-concern-related spec locations for consistency ( #38200 )
2026-03-17 09:50:32 +00:00
Matt Jankowski
f07e84f9de
Rescue JSON::ParserError where already converted ( #38244 )
2026-03-17 08:57:10 +00:00
Claire
73f77c49d8
Merge commit '16c41e035bdd6e08927c950aeeb5332adbe8b6d5' into glitch-soc/merge-upstream
...
Conflicts:
- `lib/mastodon/version.rb`:
Upstream bumped the Mastodon API version, glitch-soc has an extra glitch version.
Bumped the Mastodon API version as upstream did.
2026-03-16 18:16:56 +01:00
Matt Jankowski
16c41e035b
Use JSON.parse in AP inboxes ( #38238 )
2026-03-16 16:58:13 +00:00
Matt Jankowski
8792d6f840
Use JSON.generate in trivial string/hash conversion in specs ( #38224 )
2026-03-16 15:16:43 +00:00
Matt Jankowski
0c75e97345
Use JSON.generate in backup service ( #38234 )
2026-03-16 15:10:10 +00:00
Matt Jankowski
6b1eac8865
Use to_json call for Relay enable/disable ( #38232 )
2026-03-16 15:09:28 +00:00
Matt Jankowski
092acbd47b
Use to_json call for pins API ( #38231 )
2026-03-16 15:06:22 +00:00
Matt Jankowski
70230c632c
Use to_json call for AP::Follow reject path ( #38227 )
2026-03-16 14:40:51 +00:00
Matt Jankowski
8ed13bc6f7
Use to_json call for accounts API ( #38226 )
2026-03-16 14:40:03 +00:00
Matt Jankowski
7933fa4f94
Use to_json call in donation campaigns ( #38223 )
2026-03-16 14:32:05 +00:00
Matt Jankowski
c05492ed5a
Use JSON.generate call for fan out service ( #38222 )
2026-03-16 14:31:58 +00:00
Claire
b7246518bf
Add avatar_description and header_description parameters to PATCH /api/v1/profile ( #38221 )
2026-03-16 14:04:25 +00:00
Matt Jankowski
8124f1581a
Use to_json call in cli/domains ( #38219 )
2026-03-16 14:03:20 +00:00
