Claire
ef413ef713
Merge commit '5a8ab0a3e62a8825e28bb74c1760ba6488d20c97' into glitch-soc/merge-upstream
2025-10-15 16:35:37 +02:00
Claire
fab0dd0bcf
Change redirection for denied registration from web app to sign-in page with error message ( #36384 )
2025-10-15 11:37:22 +00:00
Claire
264d068d8d
Change new accounts to use new ActivityPub numeric ID scheme ( #36365 )
2025-10-14 16:36:55 +00:00
Claire
6fc9febb47
Merge commit '1b664cf20dbb696cf16a42efcf59ab186cb211eb' into glitch-soc/merge-upstream
2025-09-05 20:03:42 +02:00
Matt Jankowski
05a655f33e
Convert age verification controller to system specs ( #36026 )
2025-09-05 12:44:09 +00:00
Matt Jankowski
3efba15b3c
Use pluck on DomainAllow.allowed_domains for export ( #36019 )
2025-09-05 12:30:18 +00:00
Claire
3f166bb068
Merge commit 'ffeb5da9912a3b7db0deb8aec429e661ef609c59' into glitch-soc/merge-upstream
2025-08-05 15:46:33 +02:00
Matt Jankowski
8131268256
Replace unprocessable_entity -> unprocessable_content ( #35658 )
2025-08-05 07:42:08 +00:00
Claire
8649681c51
Merge commit 'e93efe0e131481635e88d7ad114ef66148626f90' into glitch-soc/merge-upstream
...
Conflicts:
- `app/serializers/activitypub/note_serializer.rb`:
Conflict because upstream added context extensions where glitch-soc had its own.
Added upstream's new context extension while keeping ours.
2025-07-25 21:45:00 +02:00
Matt Jankowski
2e35defeec
Update rubocop to version 1.79.0 ( #35502 )
2025-07-25 07:22:05 +00:00
Claire
72affd6b45
Merge commit 'a863e68d174b176dc350d8e3472c010cd37b7807' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/trends/statuses.rb`:
Conflict because of glitch-soc's setting to allow CWs in trends.
Kept glitch-soc's setting but followed upstream's refactor.
- `docker-compose.yml`:
Conflict because of upstream VS glitch-soc repos.
Updated version number as upstream did, but kept glitch-soc repos.
2025-07-24 18:10:38 +02:00
Matt Jankowski
290e36d7e8
Finish migration of api/web/push_subscriptions controller->request spec ( #35482 )
2025-07-24 07:46:09 +00:00
Claire
eeffe580d8
Merge commit '74fc4dbacf5a9168074e91fc2d75309dc42ff1ed' into glitch-soc/merge-upstream
2025-07-15 18:19:32 +02:00
Matt Jankowski
30344d6abf
Confirm User#login_activities in auth/sessions spec ( #35372 )
2025-07-15 06:31:00 +00:00
Claire
ad38168b77
Merge commit '7273f6c03cfc7fb74cc29ca9df610d1efb16417d' into glitch-soc/merge-upstream
2025-07-14 20:50:55 +02:00
Matt Jankowski
7273f6c03c
Move shared params to common method in admin/reports/actions ( #35353 )
2025-07-14 09:23:18 +00:00
Claire
3efc857fbc
Merge commit '8ee6cee36e313fcc39763210dfcd3b871b47cacb' into glitch-soc/merge-upstream
2025-07-08 16:41:01 +02:00
Matt Jankowski
1ae3510ede
Add coverage for TOS interstitial interruption flow of web app controller concern ( #35235 )
2025-07-02 09:21:32 +00:00
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
