Claire
f8f458e5e6
Merge commit '0ec6c26af3d7dc9a0eeb5631ebb9f56b724aaa8e' into glitch-soc/merge-upstream
2025-06-20 12:01:02 +02:00
David Roetzel
0ec6c26af3
Fix error when RFC9421 signatures are used ( #35109 )
2025-06-20 09:44:26 +00:00
Claire
2c751a6a19
Merge commit 'c644413f8a068490ddb8038441e5b59112e8294e' into glitch-soc/merge-upstream
2025-06-16 20:08:52 +02:00
Matt Jankowski
ca3cc36549
Allow more flexible host/port treatment with LOCAL_DOMAIN values in tests ( #35040 )
2025-06-16 13:12:23 +00:00
David Roetzel
b2506478ba
Add FASP follow recommendation support ( #34964 )
2025-06-16 10:43:27 +00:00
Matt Jankowski
6f2aba989f
Move "limited federation mode" config to x.mastodon area ( #35041 )
2025-06-16 06:13:03 +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
80af1ea434
Merge commit '825312d4b0587c0da5575f8eaabe038438746cd3' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/theme_helper.rb`:
Conflict because of different theming system.
Adapted upstream's changes.
- `vite.config.mts`:
Conflict because of different theming system.
Adapted upstream's changes.
2025-06-12 20:32:25 +02: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
Echo
825312d4b0
Fix theme name requirement regression with efficient lookup by name ( #35007 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com >
2025-06-12 14:09:45 +00:00
Matt Jankowski
1200f70ae7
Simplify QR/OTP generation in 2FA/confirmations spec ( #35019 )
2025-06-12 06:54:51 +00:00
Matt Jankowski
3509064801
Reduce hard coding of instance hostname in AdminMailer specs ( #35020 )
2025-06-12 06:53:39 +00:00
Claire
86a7a1ef3b
Merge commit '3aed93711c0118ab68fa09f4d3ac2635cb3344b8' into glitch-soc/merge-upstream
2025-06-11 22:52:21 +02:00
Claire
aa6d1d4ac1
Merge commit '629bb74451242060298c6fb305c5337002379cc2' into glitch-soc/merge-upstream
2025-06-11 18:55:03 +02:00
Eugen Rochko
f53bb4cd7d
Add "More" to the sidebar menu with links to mutes, blocks, and so on ( #34987 )
2025-06-11 16:12:04 +00:00
Matt Jankowski
629bb74451
Replace selenium-webdriver with playwright ( #34867 )
2025-06-10 16:33:46 +00:00
Claire
7a7e0ba4cd
Add basic support for remote attachments with multiple media types ( #34996 )
2025-06-10 13:26:29 +00:00
Matt Jankowski
dc2cfd50a0
Fix Style/OptionalBooleanParameter cop ( #34968 )
2025-06-10 08:17:35 +00:00
Claire
564d74ea36
Merge commit 'd887790e86124493df850e9bc52e1e059207b523' into glitch-soc/merge-upstream
2025-06-06 18:16:52 +02:00
Claire
d0c6f30378
Add fasp queue to sidekiq queue system check ( #34965 )
2025-06-06 15:23:16 +00:00
Claire
4b22aa93a2
Merge commit '989ca63b596c9006c5606edd4e66498e29e83489' into glitch-soc/merge-upstream
2025-06-06 12:56:00 +02:00
Claire
989ca63b59
Remove inbound_quotes feature flag ( #34958 )
2025-06-06 08:25:59 +00:00
Claire
86627624f1
Fix quote post streaming edge cases ( #34957 )
2025-06-06 07:32:24 +00:00
Claire
2085b0b53a
Merge commit '520974e05211e988b0447f7f29e88798b1794bcf' into glitch-soc/merge-upstream
...
Conflicts:
- `app/serializers/rest/status_serializer.rb`:
Not a real conflict, just glitch-soc code textually adjacent to code added
upstream.
2025-06-05 18:02:40 +02:00
Matt Jankowski
1d152d2181
Replace local vars with let in JS-enabled system specs ( #34905 )
2025-06-05 07:08:52 +00:00
Claire
088af860b3
Merge commit '9c80b16401e7606cbd7eb2bf3af32c18953d1d3f' into glitch-soc/merge-upstream
2025-06-02 12:16:06 +02:00
David Roetzel
9c80b16401
Accept HTTP Message Signatures (RFC9421) ( #34814 )
2025-06-02 09:27:08 +00:00
Claire
00b56932de
Fix handling of featured tag removal ( #34887 )
2025-06-02 08:09:30 +00:00
Claire
8e409f92fe
Merge commit '32b521b7f4055ccd4e59587589c2bed7759537cb' into glitch-soc/merge-upstream
2025-05-31 17:32:57 +02:00
Claire
32b521b7f4
Fix multiple issues in quoted posts hydration ( #34864 )
2025-05-31 15:20:31 +00:00
Claire
c00e27aa55
Merge commit '54ad57ea9527a58ac2b95159ed178ed7c737a89c' into glitch-soc/merge-upstream
2025-05-30 17:41:31 +02:00
Claire
4b39bced3e
Increase capybara default timeout to reduce test flakiness ( #34859 )
2025-05-30 13:13:24 +00:00
Matt Jankowski
c025824f98
Use config_for for cache buster values ( #34851 )
2025-05-30 11:54:25 +00:00
Matt Jankowski
f7a3dd0e38
Use config_for for VAPID key storage ( #34845 )
2025-05-30 07:00:33 +00:00
Claire
b627aee45f
Merge commit 'ca41a95872545502dbc6bae6f7237ee20acc38ee' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/helpers/theme_helper_spec.rb`:
Conflict due to glitch-soc's different theming system.
Adapted upstream changes to glitch-soc's theming system.
2025-05-28 18:41:47 +02:00
Matt Jankowski
38e0a360ca
Add coverage for "default" stylesheet theme helper path ( #34732 )
2025-05-28 13:33:07 +00:00
David Roetzel
b195956ecb
Encapsulate redis key usage ( #34840 )
2025-05-28 12:34:37 +00:00
Emelia Smith
a73ade526a
Assert usage of client credentials for account registration ( #34828 )
2025-05-28 12:09:32 +00:00
Claire
086a7016c4
Merge commit 'd78535eab9cefc285c0d7ef88adb125ab1ceb6bd' into glitch-soc/merge-upstream
...
Conflicts:
- `vite.config.mts`:
Upstream moved its theming system to a plug-in, where we had our own.
Adapted the file as well as our own plugin to adopt the same mechanisms.
2025-05-27 20:49:19 +02:00
Matt Jankowski
37c82a3003
Update sidekiq to version 7 ( #34745 )
2025-05-26 15:32:41 +00:00
Claire
706c8bf1a0
Merge commit 'a13756148d353c7479f68e65a210f6d88d26c785' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/layouts/embedded.html.haml`:
Upstream made a change to javascript tags next to lines changed in glitch-soc
because of the theming system.
Added the javascript entrypoint upstream added.
- `app/views/layouts/error.html.haml`:
Upstream made a change to javascript tags next to lines changed in glitch-soc
because of the theming system.
Added the javascript entrypoint upstream added.
2025-05-25 15:11:58 +02:00
Claire
b031f65670
Merge commit 'f1a6f4333a75f5bc186334f7f43a26e969cd712d' into glitch-soc/merge-upstream
2025-05-25 14:51:59 +02:00
Claire
f622686397
Merge commit '90f7b90223ce3212a2bb9746a119bcc9287b3237' into glitch-soc/merge-upstream
...
Conflicts:
- `yarn.lock`:
Upstream updated dependencies, including one textually adjacent to a
glitch-soc-only dependency.
Updated dependencies as upstream did.
2025-05-25 14:38:25 +02:00
Claire
f49940db85
Merge commit 'c4f47adb49663f24ee80d9174ab24431a8c165c0' into glitch-soc/merge-upstream
...
Too many conflicts to list, because of webpack → vite migration.
2025-05-25 14:36:51 +02:00
Claire
304c0417ed
Fix handling of inlined featured collections in ActivityPub actor objects ( #34789 )
2025-05-23 15:01:07 +00:00
David Roetzel
3acd87419c
Update to linzer 0.7 ( #34765 )
2025-05-23 06:43:02 +00:00
Claire
6ab96ba647
Use more generic locale as fallback for rules ( #34756 )
2025-05-21 16:22:54 +00:00
Matt Jankowski
f1a6f4333a
Remove redis-namespace gem ( #34742 )
2025-05-21 15:20:17 +00:00
