Claire
572f18c322
Merge commit '664efcf4c3f9713894054fb642a252d8752a4123' into glitch-soc/merge-upstream
2026-03-25 21:09:30 +01:00
Matt Jankowski
664efcf4c3
Add have_attachment matcher for attached file exports ( #38389 )
2026-03-25 13:18:14 +00:00
Matt Jankowski
d42182d9a2
Use more granular content check via parsed_body ( #38378 )
2026-03-25 09:58:04 +00:00
Claire
291f141a02
Merge commit '1ee457f2d37c2b77a7fbce246a7c72ac9f9d3056' into glitch-soc/merge-upstream
2026-03-19 18:14:55 +01:00
Claire
1ee457f2d3
Split invite_users permission into invite_bypass_approval ( #38278 )
2026-03-19 15:25:54 +00:00
Claire
8d717ab161
Merge commit '1d46558e8d949860acc4f3a86516b9989bd74f79' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/controllers/application_controller_spec.rb`:
Upstream moved specs that were textually-adjacent to glitch-soc ones.
Kept the glitch-soc ones.
2026-03-09 18:14:15 +01:00
Matt Jankowski
2c6d072175
Extract ErrorResponses from application controller ( #38105 )
2026-03-09 11:30:41 +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
Matt Jankowski
34514bcfe9
Move theme-related helper methods out of controller ( #37807 )
2026-02-10 15:34:42 +00:00
Claire
75ba314e6b
Migrate to new theming infrastructure ( #37612 )
2026-02-10 10:59:47 +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
f652c54c33
Update devise to version 5.0 ( #37419 )
2026-02-05 11:05:32 +00: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
Matt Jankowski
0d6fc8026d
Convert auth/confirmations spec controller->request ( #37735 )
2026-02-04 17:42:50 +00:00
Matt Jankowski
4f99b48e8e
Convert admin/accounts controller->request specs ( #37727 )
2026-02-04 10:42:34 +00:00
Claire
5a45a3203a
Merge commit '7af5ba271d6f04831f000e9b815914375e42abeb' into glitch-soc/merge-upstream
2026-01-27 18:03:27 +01:00
Matt Jankowski
aa347708f5
Convert oauth/authorized_applications spec controller->request ( #37614 )
2026-01-27 10:44:24 +00:00
Matt Jankowski
604bed2930
Convert oauth/authorizations spec controller->request ( #37613 )
2026-01-27 10:20:25 +00:00
Matt Jankowski
634ff77d82
Convert settings/aliases spec controller->system ( #37617 )
2026-01-27 10:18:07 +00:00
Claire
780fefa700
Merge commit '53be8392eceea8c3a576478e209fe82c2ceb458a' into glitch-soc/merge-upstream
2025-12-16 18:27:03 +01:00
Matt Jankowski
53be8392ec
Add coverage for blocked account scenario in following/followers ( #36042 )
2025-12-16 16:13:03 +00:00
Claire
6ff4dad89d
Merge commit '055f581ca58b62132c1eff23453031d9df9dbf0e' into glitch-soc/merge-upstream
2025-10-31 18:03:21 +01:00
Matt Jankowski
aefd728309
Use before_action to protect hidden collections in following/followers lists ( #35783 )
2025-10-30 16:34:19 +00:00
Claire
5f3f75559f
Merge commit '1dead10312caa0cc7719cb80052af549ddf3e6a1' into glitch-soc/merge-upstream
2025-10-28 20:25:09 +01:00
Matt Jankowski
2640cf5317
Update stoplight to version 5.4.0 ( #36581 )
2025-10-27 09:38:01 +00:00
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
