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
9c5c86c947
Merge commit 'c93b2c6809905d24262b5973efe20832f1b04a6d' into glitch-soc/merge-upstream
2025-03-26 18:18:07 +01:00
02db065571
Use fixed order in flaky spec ( #34279 )
2025-03-26 13:26:24 +00:00
59e189ad3c
Add support for paginating partial collections in `SynchronizeFollowersService` ( #34277 )
2025-03-26 11:33:59 +00:00
2a181f56e3
Convert `settings/deletes` spec controller->request/system ( #34274 )
2025-03-26 07:26:28 +00:00
745c445e7e
Merge commit 'e1dbbf6c9db6dbf3f356dae4c59fa05299372370' into glitch-soc/merge-upstream
2025-03-25 19:59:59 +01:00
e1dbbf6c9d
Isolate assertions in v2/notifications intermittent failure cases ( #34271 )
2025-03-25 16:22:41 +00:00
3edac14f02
Fix follower synchronization mechanism erroneously removing followers from multi-page collections ( #34272 )
2025-03-25 15:50:05 +00:00
38f5e74122
Add `Deprecation` headers on deprecated endpoints ( #34262 )
...
Co-authored-by: Damien Mathieu <42@dmathieu.com>
2025-03-25 12:30:10 +00:00
9bba2aab33
Convert `intents` spec controller->request ( #34261 )
2025-03-25 09:07:22 +00:00
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
225b18e742
Add system spec for account notes ( #34206 )
2025-03-24 09:30:23 +00:00
ef870007e9
Fix `CacheBuster` being queued for missing media attachments ( #34253 )
2025-03-24 08:58:15 +00:00
9d3daa847a
Convert `filters/statuses` spec controller->system/request ( #34232 )
2025-03-24 08:11:34 +00:00
f1fa6b3cd0
Merge commit '1960aac90b16fce1ec620ac990aa931efcf04700' into glitch-soc/merge-upstream
2025-03-22 15:41:48 +01:00
a2981a0997
Convert `admin/users/two_factor_authentications` spec controller->system ( #34216 )
2025-03-21 07:41:38 +00:00
469cfc5430
Convert `admin/change_emails` spec controller->system ( #34215 )
2025-03-21 07:40:29 +00:00
0284e77e5f
Convert `admin/action_logs` spec controller->system ( #34214 )
2025-03-21 07:38:29 +00:00
971690caf2
Merge commit 'f7b1769e8a69e2831493f3a704d68efa5cf9beff' into glitch-soc/merge-upstream
2025-03-19 20:09:14 +01:00
f7b1769e8a
Convert `admin/dashboard` spec controller->system ( #34208 )
2025-03-19 08:32:36 +00:00
539a06f189
Convert `admin/account_actions` spec controller->system ( #34207 )
2025-03-19 08:20:16 +00:00
6f2979b0b0
Merge commit '547658f086b2bfb396f69822d7ba938e4c0caf80' into glitch-soc/merge-upstream
2025-03-18 22:03:50 +01:00
795d465f8d
Convert `disputes/strikes` spec controller->request/system ( #34191 )
2025-03-18 08:18:36 +00:00
8ef546fe6b
Convert `oauth/tokens#revoke` spec controller->request ( #34174 )
2025-03-18 08:16:42 +00:00
d2c4f69148
Merge commit '30e334b51a4e7add05401895bff5a2ea4a97e0bd' into glitch-soc/merge-upstream
2025-03-17 20:25:32 +01:00
e30001bc80
Fix incorrect URL being used when cache busting ( #34189 )
2025-03-17 16:40:28 +00:00
0efa669fe9
Merge commit '2f98134ac69ee840095c9d8389e4b2fff72f20c1' into glitch-soc/merge-upstream
2025-03-15 17:49:32 +01:00
d213c585ff
Add age verification on sign-up ( #34150 )
2025-03-14 14:07:29 +00:00
4a6cf67c46
Add middleware to record queue time ( #34172 )
2025-03-14 13:52:04 +00:00
b330cc21c4
Merge commit 'aff51823752b809c3349698b6be02bfdda7a9010' into glitch-soc/merge-upstream
2025-03-12 19:48:51 +01:00
f71a855e2d
Add coverage for `standard` params on push subs create ( #34092 )
2025-03-12 14:29:19 +00:00
966b816382
Refactor `ActivityPub::FetchRepliesService` and `ActivityPub::FetchAllRepliesService` ( #34149 )
2025-03-12 11:52:38 +00:00
9db26db495
Refactor reply-fetching code and disable it by default ( #34147 )
2025-03-12 10:28:06 +00:00
46e13dd81c
Add Fetch All Replies Part 1: Backend ( #32615 )
...
Signed-off-by: sneakers-the-rat <sneakers-the-rat@protonmail.com>
Co-authored-by: jonny <j@nny.fyi>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: Kouhai <66407198+kouhaidev@users.noreply.github.com>
2025-03-12 09:03:01 +00:00
399fbf97de
Merge commit '420ffdfb6259740602d4ce727ed5c60432c776a5' into glitch-soc/merge-upstream
2025-03-11 18:44:32 +01:00
420ffdfb62
Add delay to profile updates to debounce them ( #34137 )
2025-03-11 16:17:17 +00:00
6d5a1fbe1d
Assert on page contents while progressing through `new_statuses` system spec ( #34139 )
2025-03-11 14:00:51 +00:00
325b55485e
Convert `admin/settings/branding` spec controller->request ( #34130 )
2025-03-11 13:32:39 +00:00
bedf808e02
Move feature flag test setup into config ( #34124 )
2025-03-11 13:29:17 +00:00
dc43699b77
Assert on page contents before reloading report for interface JS spec ( #34132 )
2025-03-11 09:14:16 +00:00
fb55d09f77
Merge commit 'fb34d9c5909116d586a0187d86ada36ee1234f61' into glitch-soc/merge-upstream
2025-03-10 19:48:45 +01:00
26b5f45564
Make `Faker` generate unique TOS effective dates ( #34122 )
2025-03-10 09:33:37 +00:00
e1f278cdf2
Convert `admin/webhooks/secrets` spec controller->system ( #34109 )
2025-03-10 08:17:48 +00:00
7169b270ae
Convert `admin/site_uploads` spec controller->system ( #34108 )
2025-03-10 08:17:02 +00:00
4bea9a0a66
Merge commit '04492e7f934d07f8e89fa9c3d4fe3381f251e8a2' into glitch-soc/merge-upstream
2025-03-07 18:34:27 +01:00
dbd3e05812
Merge commit 'b57687083f4af178f2e2f43665eb4e49d32a50c2' into glitch-soc/merge-upstream
2025-03-07 17:37:36 +01:00
9d5a9123b9
Merge commit 'ce23342d72a7f2ca6f8c35727c86ba54c9c365ca' into glitch-soc/merge-upstream
2025-03-07 13:15:10 +01:00
2cabbae132
Add min. age to terms of service ( #34105 )
2025-03-07 11:50:52 +00:00
eaf1ea3155
Remove `admin_user` helper method from `SystemHelpers` module ( #34096 )
2025-03-07 08:31:47 +00:00
551339401d
Use methods from `SystemHelpers` more consistently ( #33973 )
2025-03-07 08:02:55 +00:00
Claire