Claire
3593ddff11
Merge commit 'b320c9e4c901bf99ccbca321bad2ceb2f51de140' into glitch-soc/merge-upstream
2026-03-17 18:58:19 +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
Matt Jankowski
b9d25bde3e
Convert mix of JSON.parse and JSON.load_file ( #38242 )
2026-03-17 13:27:57 +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
092acbd47b
Use to_json call for pins API ( #38231 )
2026-03-16 15:06:22 +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
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
1a464bc5ed
Use to_json in simple view hash data-props build locations ( #38218 )
2026-03-16 14:02:52 +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
Matt Jankowski
e2bf09d57d
Add timestamp spec for markers API response ( #38206 )
2026-03-16 08:48:10 +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
Claire
4bcd0caa79
Merge commit 'e235c446c96280c015fb27f7eefe4e95a5a39892' into glitch-soc/merge-upstream
2026-03-09 12:41:12 +01:00
Matt Jankowski
eabbda3148
Fix Style/SelectByKind cop ( #38084 )
2026-03-09 09:34:58 +00:00
Claire
a4af7a531d
Merge commit 'eb848d082afc8864b2aa15858f414e4867902c65' into glitch-soc/merge-upstream
2026-03-07 17:29:09 +01:00
Matt Jankowski
812c109e87
Remove message argument from NoteLengthValidator error approach ( #37977 )
2026-03-05 17:44:52 +00:00
Claire
0a989af8c6
Merge commit '3d8d5f6dc7625d9638cc2e3387247442225d4e3f' into glitch-soc/merge-upstream
2026-03-05 18:21:07 +01:00
Claire
1add29cf40
Redirect to short account URLs when requesting HTML for one of the AP endpoints ( #38056 )
2026-03-04 17:44:27 +00:00
Claire
45b87f31ff
Merge commit 'a3aeae02885408381c7c1f3f6a0cc88799823409' into glitch-soc/merge-upstream
2026-03-03 18:12:16 +01:00
Claire
a3aeae0288
Add test to cover proper URL for media in DELETE /api/v1/statuses/:id ( #38037 )
2026-03-03 15:36:54 +00:00
Claire
1b92ac0729
Merge commit '74b3b6c798d1f137947e80df8eefb7412e70febd' into glitch-soc/merge-upstream
2026-03-02 18:11:45 +01:00
David Roetzel
f953d40289
Add API to revoke collection item ( #38027 )
2026-03-02 13:38:03 +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
David Roetzel
6b88dd4923
Issue FeatureAuthorizations ( #38004 )
2026-02-27 11:00:21 +00:00
Claire
dc27eccc8e
Merge commit 'bca57020a04c552a3c91912a0e0b69ddafaad06a' into glitch-soc/merge-upstream
2026-02-26 18:27:02 +01:00
Claire
9c4d11f927
Add featured_tags to GET /api/v1/profile ( #37932 )
2026-02-26 16:18:42 +00:00
Claire
c15c49b5b6
Merge commit '1e87bd178d96ab7d760f019fcf651ecc1585e701' into glitch-soc/merge-upstream
2026-02-24 15:14:25 +01:00
Claire
43ef9f66b6
Add PATCH /api/v1/profile ( #37934 )
2026-02-24 10:48:56 +00:00
Claire
85f72a3940
Merge commit '6ba6285a73c3a8b281123814d45f534e3bcebb96' into glitch-soc/merge-upstream
2026-02-20 21:08:06 +01:00
David Roetzel
6ba6285a73
Reject unconfirmed FASPs ( #37926 )
2026-02-20 14:40:31 +00:00
Claire
cc1e65dcec
Add GET /api/v1/profile ( #37912 )
2026-02-20 10:16:04 +00:00
Claire
eebed16f59
Merge commit '8e7c3973dc67835e0ce9c7073b9344ec19d3910a' into glitch-soc/merge-upstream
2026-02-19 21:52:23 +01:00
David Roetzel
e288bf6516
Show reported collections in moderation interface ( #37898 )
2026-02-19 12:46:38 +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
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
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
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
e82eb2b037
Convert admin/confirmations spec controller->request/system ( #37738 )
2026-02-05 10:04:10 +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
