Claire
c9a1e27a49
Merge commit 'dbb20f76a781defe35d077529c8269d712c1fbd2' into glitch-soc/merge-upstream
...
Conflicts:
- `tsconfig.json`:
glitch-soc had extra paths under `app/javascript/flavours`, but upstream
added `app/javascript` as a whole, so updated to upstream's.
2025-06-25 19:29:09 +02:00
Matt Jankowski
8285194451
Move layout setup for OAuth views to controllers ( #35176 )
2025-06-25 13:26:17 +00:00
Matt Jankowski
47fda2df2c
Update OAuth inflection to match spec ( #35160 )
2025-06-25 07:52:30 +00:00
Claire
7da6b07c75
Merge commit '71d4ce1c228bab470fa9d3bcb5a130cf53665103' into glitch-soc/merge-upstream
2025-06-13 18:07:59 +02:00
Matt Jankowski
ab7f50ce4e
Reduce hard coding of LOCAL_DOMAIN env value throughout tests ( #35025 )
2025-06-13 07:58:22 +00:00
Claire
220b78d4a9
Merge commit '2254f47702368938bdfd0d997f2487fb2950d676' into glitch-soc/merge-upstream
2025-06-12 17:39:03 +02:00
David Roetzel
319fbbbfac
Experimental Async Refreshes API ( #34918 )
2025-06-12 14:54:00 +00:00
Matt Jankowski
1200f70ae7
Simplify QR/OTP generation in 2FA/confirmations spec ( #35019 )
2025-06-12 06:54:51 +00:00
Claire
b031f65670
Merge commit 'f1a6f4333a75f5bc186334f7f43a26e969cd712d' into glitch-soc/merge-upstream
2025-05-25 14:51:59 +02:00
Matt Jankowski
f1a6f4333a
Remove redis-namespace gem ( #34742 )
2025-05-21 15:20:17 +00:00
Claire
dae6f19490
Merge commit '7a70d9543525681b5c408cfd17782843da13177f' into glitch-soc/merge-upstream
2025-04-25 17:22:10 +02:00
Matt Jankowski
6463415e06
Update rubocop-rspec to version 3.6.0 ( #34497 )
2025-04-24 14:56:13 +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
a5eaa95bb2
Merge commit 'e28b64ac2dcd381f8b7e6bcfc2cc2b2ed3121cd9' into glitch-soc/merge-upstream
2025-03-28 18:48:04 +01: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
9c5c86c947
Merge commit 'c93b2c6809905d24262b5973efe20832f1b04a6d' into glitch-soc/merge-upstream
2025-03-26 18:18:07 +01: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
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
f1fa6b3cd0
Merge commit '1960aac90b16fce1ec620ac990aa931efcf04700' into glitch-soc/merge-upstream
2025-03-22 15:41:48 +01:00
Matt Jankowski
a2981a0997
Convert admin/users/two_factor_authentications spec controller->system ( #34216 )
2025-03-21 07:41:38 +00:00
Matt Jankowski
469cfc5430
Convert admin/change_emails spec controller->system ( #34215 )
2025-03-21 07:40:29 +00:00
Matt Jankowski
0284e77e5f
Convert admin/action_logs spec controller->system ( #34214 )
2025-03-21 07:38:29 +00:00
Claire
971690caf2
Merge commit 'f7b1769e8a69e2831493f3a704d68efa5cf9beff' into glitch-soc/merge-upstream
2025-03-19 20:09:14 +01:00
Matt Jankowski
f7b1769e8a
Convert admin/dashboard spec controller->system ( #34208 )
2025-03-19 08:32:36 +00:00
Matt Jankowski
539a06f189
Convert admin/account_actions spec controller->system ( #34207 )
2025-03-19 08:20:16 +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
Matt Jankowski
325b55485e
Convert admin/settings/branding spec controller->request ( #34130 )
2025-03-11 13:32:39 +00:00
Claire
fb55d09f77
Merge commit 'fb34d9c5909116d586a0187d86ada36ee1234f61' into glitch-soc/merge-upstream
2025-03-10 19:48:45 +01:00
Matt Jankowski
e1f278cdf2
Convert admin/webhooks/secrets spec controller->system ( #34109 )
2025-03-10 08:17:48 +00:00
Matt Jankowski
7169b270ae
Convert admin/site_uploads spec controller->system ( #34108 )
2025-03-10 08:17:02 +00:00
Claire
4bea9a0a66
Merge commit '04492e7f934d07f8e89fa9c3d4fe3381f251e8a2' into glitch-soc/merge-upstream
2025-03-07 18:34:27 +01:00
Claire
9d5a9123b9
Merge commit 'ce23342d72a7f2ca6f8c35727c86ba54c9c365ca' into glitch-soc/merge-upstream
2025-03-07 13:15:10 +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
Matt Jankowski
ce23342d72
Convert admin/terms_of_service/* spec controller->system ( #33975 )
2025-03-04 15:27:44 +00:00
Matt Jankowski
b56e90d049
Convert admin/relationships spec controller->system ( #34002 )
2025-02-28 11:17:13 +00:00
Matt Jankowski
3aaa388ce4
Convert admin/trends/* spec controller->system ( #34003 )
2025-02-28 10:55:37 +00:00
Claire
a682bd19f5
Merge commit '20531d1e078a27116dea53ce21c1b32bf3774eca' into glitch-soc/merge-upstream
2025-02-25 18:52:24 +01:00
