Claire
8cbd99e645
Merge commit 'a324edabdfc19b6978ed31800b92e36022006cd5' into glitch-soc/merge-upstream
2025-04-21 14:32:47 +02:00
Eugen Rochko
ff0990ec9f
Add REST API for fetching an account's endorsed accounts ( #34421 )
2025-04-16 05:39:20 +00:00
Matt Jankowski
2eaef09166
Use enum validation instead of ArgumentError
rescue for List
replies policy check ( #34452 )
2025-04-14 21:11:10 +00:00
Matt Jankowski
aadff24099
Enable validate: true
on CustomFilter#action
( #34434 )
2025-04-14 07:28:11 +00:00
Claire
99e3ea232f
Merge commit '5f87ae101c5e0e940e148d493eaac1ce31fe24c1' into glitch-soc/merge-upstream
2025-04-04 20:00:24 +02:00
Matt Jankowski
d315a90db7
Convert settings/pictures
spec controller->request ( #34340 )
2025-04-02 12:58:47 +00:00
Claire
f8b0f38636
Merge commit '902aab1245a06319b7acd20045bd9ce051627300' into glitch-soc/merge-upstream
2025-03-29 17:02:39 +01:00
Claire
a5eaa95bb2
Merge commit 'e28b64ac2dcd381f8b7e6bcfc2cc2b2ed3121cd9' into glitch-soc/merge-upstream
2025-03-28 18:48:04 +01:00
David Roetzel
97b9994743
Basic FASP support ( #34031 )
2025-03-28 12:16:40 +00:00
Matt Jankowski
ef879a532f
Convert activitypub/*
controller specs to request specs ( #33992 )
2025-03-27 14:55:13 +00:00
Matt Jankowski
445aa4ac72
Convert activitypub/inboxes
spec controller->request ( #34292 )
2025-03-27 13:52:48 +00:00
Claire
449dc30739
Merge commit 'c43508b3e0b05c5e739d726bad53f1eef89e9376' into glitch-soc/merge-upstream
...
Conflicts:
- `app/lib/content_security_policy.rb`:
Upstream added support for `EXTRA_MEDIA_HOSTS` which is very similar to
glitch-soc's `EXTRA_DATA_HOST`.
Deprecate `EXTRA_DATA_HOST` FOR `EXTRA_MEDIA_HOST`.
2025-03-26 19:14:26 +01:00
Claire
9c5c86c947
Merge commit 'c93b2c6809905d24262b5973efe20832f1b04a6d' into glitch-soc/merge-upstream
2025-03-26 18:18:07 +01:00
David Roetzel
02db065571
Use fixed order in flaky spec ( #34279 )
2025-03-26 13:26:24 +00:00
Matt Jankowski
2a181f56e3
Convert settings/deletes
spec controller->request/system ( #34274 )
2025-03-26 07:26:28 +00:00
Claire
745c445e7e
Merge commit 'e1dbbf6c9db6dbf3f356dae4c59fa05299372370' into glitch-soc/merge-upstream
2025-03-25 19:59:59 +01:00
Matt Jankowski
e1dbbf6c9d
Isolate assertions in v2/notifications intermittent failure cases ( #34271 )
2025-03-25 16:22:41 +00:00
Claire
38f5e74122
Add Deprecation
headers on deprecated endpoints ( #34262 )
...
Co-authored-by: Damien Mathieu <42@dmathieu.com>
2025-03-25 12:30:10 +00:00
Matt Jankowski
9bba2aab33
Convert intents
spec controller->request ( #34261 )
2025-03-25 09:07:22 +00:00
Claire
e7498887a7
Merge commit '2e9b2df570af19b67a5ccc754c7b581034ca79c6' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/styles/mastodon/components.scss`:
Upstream removed some code that somehow had been modified in glitch-soc.
Removed it as upstream did.
2025-03-24 20:06:25 +01:00
Matt Jankowski
9d3daa847a
Convert filters/statuses
spec controller->system/request ( #34232 )
2025-03-24 08:11:34 +00:00
Claire
6f2979b0b0
Merge commit '547658f086b2bfb396f69822d7ba938e4c0caf80' into glitch-soc/merge-upstream
2025-03-18 22:03:50 +01:00
Matt Jankowski
795d465f8d
Convert disputes/strikes
spec controller->request/system ( #34191 )
2025-03-18 08:18:36 +00:00
Matt Jankowski
8ef546fe6b
Convert oauth/tokens#revoke
spec controller->request ( #34174 )
2025-03-18 08:16:42 +00:00
Claire
0efa669fe9
Merge commit '2f98134ac69ee840095c9d8389e4b2fff72f20c1' into glitch-soc/merge-upstream
2025-03-15 17:49:32 +01:00
Eugen Rochko
d213c585ff
Add age verification on sign-up ( #34150 )
2025-03-14 14:07:29 +00:00
Claire
b330cc21c4
Merge commit 'aff51823752b809c3349698b6be02bfdda7a9010' into glitch-soc/merge-upstream
2025-03-12 19:48:51 +01:00
Matt Jankowski
f71a855e2d
Add coverage for standard
params on push subs create ( #34092 )
2025-03-12 14:29:19 +00:00
Claire
399fbf97de
Merge commit '420ffdfb6259740602d4ce727ed5c60432c776a5' into glitch-soc/merge-upstream
2025-03-11 18:44:32 +01:00
Claire
420ffdfb62
Add delay to profile updates to debounce them ( #34137 )
2025-03-11 16:17:17 +00:00
Matt Jankowski
325b55485e
Convert admin/settings/branding
spec controller->request ( #34130 )
2025-03-11 13:32:39 +00:00
Claire
4bea9a0a66
Merge commit '04492e7f934d07f8e89fa9c3d4fe3381f251e8a2' into glitch-soc/merge-upstream
2025-03-07 18:34:27 +01:00
Claire
b6f3cfb302
Merge commit 'e5655a5f65eb8116640ae434125553e0fe77f35e' into glitch-soc/merge-upstream
2025-03-06 20:10:00 +01:00
Matt Jankowski
b021cfc91e
Convert settings/sessions
spec controller->system ( #34072 )
2025-03-06 08:21:05 +00:00
Emelia Smith
4960193ed0
Add API to delete media attachments that are not in use ( #33991 )
2025-02-28 13:41:42 +00:00
Claire
e71fb450e0
Add optional delete_media
parameter to DELETE /api/v1/statuses/:id
( #33988 )
2025-02-28 13:39:01 +00:00
Emelia Smith
febcd0a76c
Expose status language via og:locale ( #34012 )
2025-02-28 10:53:39 +00:00
Claire
1cdd91d6f1
Merge commit '6b519cfefa93a923b19d0f20c292c7185f8fd5f5' into glitch-soc/merge-upstream
2025-02-27 15:52:20 +01:00
Jeremy Kescher
6b519cfefa
Merge commit from fork
...
* Fix domain blocks/rationales being visible to unapproved/unconfirmed users
* Fix domain blocks/rationales being visible to suspended users
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
* Allow moved users to view domain blocks
* Add authorization specs for `/api/v1/instance/domain_blocks` spec
* Fix tests
* Fix incorrect test setup
---------
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2025-02-27 15:49:57 +01:00
Claire
06f879ce9b
Merge commit from fork
...
* Add rate-limit on `/auth/setup`
* Remove useless test
2025-02-27 15:44:35 +01:00
Claire
a682bd19f5
Merge commit '20531d1e078a27116dea53ce21c1b32bf3774eca' into glitch-soc/merge-upstream
2025-02-25 18:52:24 +01:00
Claire
20531d1e07
Fix GET /api/v2/notifications/:id
and POST /api/v2/notifications/:id/dismiss
for ungrouped notifications ( #33990 )
2025-02-25 14:37:44 +00:00
Claire
524e8992ad
Merge commit 'db971976853103017b1561f2c4f9406fa00c0a2e' into glitch-soc/merge-upstream
2025-02-22 21:31:46 +01:00
Matt Jankowski
2a15bf4ede
Convert admin/roles
controller spec to request/sytem specs ( #33947 )
2025-02-21 11:47:47 +00:00
Matt Jankowski
d065d02d88
Improve example wording in 2FA/confirmations controller spec ( #33944 )
2025-02-21 07:31:06 +00:00
Claire
f3bc50778b
Merge commit 'f1d4be1e7509f795706ff2310c5fc36e0e79bf4d' into glitch-soc/merge-upstream
2025-02-18 20:38:57 +01:00
Matt Jankowski
fbea3a64cc
Convert statuses
spec controller->system/request ( #33921 )
2025-02-18 11:43:49 +00:00
Matt Jankowski
ea53faeb3f
Convert admin/users/roles
spec controller->system/request ( #33930 )
2025-02-17 09:25:25 +00:00
Matt Jankowski
8f1b41622b
Convert settings/two_factor_authentication_methods
spec controller->system/request ( #33914 )
2025-02-13 10:50:04 +00:00
Matt Jankowski
62dc303d3c
Convert settings/two_factor_authentication/recovery_codes
spec controller->system/request ( #33912 )
2025-02-13 08:02:01 +00:00