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
Matt Jankowski
1a464bc5ed
Use to_json in simple view hash data-props build locations ( #38218 )
2026-03-16 14:02:52 +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
Matt Jankowski
f9b2dffaa8
Use JSON.generate call in push update worker ( #38208 )
2026-03-16 13:55:53 +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
5521aac4ab
Fix hashtags preceded by non-break spaces not being processed as such ( #38212 )
2026-03-16 09:39:18 +00:00
David Roetzel
c993daa347
Start of handling FeatureRequest activities ( #38193 )
2026-03-16 09:04:28 +00:00
Matt Jankowski
e2bf09d57d
Add timestamp spec for markers API response ( #38206 )
2026-03-16 08:48:10 +00:00
David Roetzel
2f989c780a
Reinstate action logging ( #38211 )
2026-03-16 08:42:06 +00:00
Claire
3afb58ad18
Merge commit '89b7a3d7fb73ba79d33cab9755424b4aa2050b1b' into glitch-soc/merge-upstream
2026-03-14 11:41:24 +01:00
Matt Jankowski
ec0e78f128
Add coverage for rewrite with vary username paths ( #38197 )
2026-03-13 16:54:57 +00:00
Matt Jankowski
6416724f75
Normalize current_username on account migration ( #38183 )
2026-03-13 09:33:02 +00:00
Claire
208b556c18
Merge commit '377952703cf70f14008cc7938479558d8cca9903' into glitch-soc/merge-upstream
2026-03-12 19:03:08 +01:00
Claire
3833eadfbf
Merge commit 'adede83c7c9a943cf9954fe865becf6a0c2d2280' into glitch-soc/merge-upstream
2026-03-12 18:48:32 +01:00
David Roetzel
377952703c
Add serializers for Accept+Reject of feature requests ( #38177 )
2026-03-12 15:46:36 +00:00
David Roetzel
eeed483518
Handle Remove of an individual collection item ( #38170 )
2026-03-12 11:11:39 +00:00
David Roetzel
353c8b2abf
Handle Remove activity on featuredCollections ( #38169 )
2026-03-12 10:37:53 +00:00
David Roetzel
94aa5d7c9e
Handle Add activity to featuredCollections ( #38167 )
2026-03-12 10:14:22 +00: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
Matt Jankowski
dc004caf71
Convert attempt IP from EmailDomainBlock history tracking to string before recording ( #38137 )
2026-03-11 10:49:07 +00:00
Claire
5fdcac60b9
Merge commit '64629eadb71afab79a741b016dc56a8bdf1d46f2' into glitch-soc/merge-upstream
2026-03-10 18:04:32 +01:00
Matt Jankowski
64629eadb7
Do not prepare returning user for unpersisted records ( #38136 )
2026-03-10 16:37:59 +00:00
Claire
Matt Jankowski
David Roetzel
diondiondion