Claire
c475623418
Merge commit 'dc6d8f882528803c06b2a71c23d6c1467880a7e1' into glitch-soc/merge-4.4
2025-09-23 18:10:55 +02:00
Claire
0b66bd591f
Fix getting Create and Update out of order ( #36176 )
2025-09-22 16:54:04 +02:00
Claire
a94d7bf520
Change quoted posts from silenced accounts not to be hidden ( #36166 )
2025-09-22 16:54:04 +02:00
Claire
19c89f1bbd
Merge commit 'c966d756007e0e4c4eb020055c999e4cf7a07ed0' into glitch-soc/merge-4.4
2025-09-16 14:14:05 +02:00
Claire
48f55e3224
Fix quote posts with CW and no text being rejected
...
Fixes #36077
2025-09-12 16:27:29 +02:00
Claire
00c61317d3
Merge remote-tracking branch 'upstream/stable-4.4' into HEAD
...
Conflicts:
- `app/views/layouts/application.html.haml`:
Conflict because of glitch-soc's theming system.
Updated the line as upstream did.
2025-09-04 18:33:21 +02:00
Matt Jankowski
7a862d3308
First pass coverage addition for antispam class ( #35771 )
2025-09-04 10:45:54 +02:00
Claire
e61900cadc
Fix quote revocation not being streamed ( #35710 )
2025-09-04 10:45:54 +02:00
Claire
1ed3e4cc77
Merge commit '5478ef9b32be0c7ac8f86330760485a7531d218a' into glitch-soc/backports-4.4
2025-08-05 15:24:44 +02:00
Claire
83dc7dc16e
Disable ActiveRecord query cache in Create critical path ( #35662 )
2025-08-05 11:43:15 +02:00
Claire
7d3cc51148
Avoid nested transactions when fetching quote posts ( #35657 )
2025-08-05 11:43:15 +02:00
Claire
fcb7917344
Merge commit '208cb8276ae618aa36aec5fad0dc31341402c133' into glitch-soc/merge-4.4
...
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.
2025-08-04 21:48:37 +02:00
Claire
4ae47f4263
Change StatusReachFinder to consider quotes as well as reblogs ( #35601 )
2025-08-01 11:34:27 +02:00
Claire
08b2f255fc
Fix synchronous recursive fetching of deeply-nested quoted posts ( #35600 )
2025-08-01 11:34:27 +02:00
Claire
6ff4e83937
Change quote verification to not bypass authorization flow for mentions ( #35528 )
2025-08-01 11:34:27 +02:00
Claire
bd442485d0
Merge commit '333a17a478f0ddcee4115a50f01077cb1dc5c22e' into glitch-soc/merge-4.4
2025-07-08 13:13:07 +02:00
David Roetzel
333a17a478
Better error response to malformed headers ( #35278 )
2025-07-08 11:45:24 +02:00
Claire
385dd5ea37
Merge commit '0c5ce23ae496af26b96aaab742800af93f552f44' into glitch-soc/merge-4.4
2025-07-04 17:56:10 +02:00
David Roetzel
7051458467
Raise better exception on FASP error responses ( #35262 )
2025-07-04 15:10:17 +02:00
Claire
f7b4580b49
Merge commit '0d650780e26735621f08bbdd545b162871e4562c' into glitch-soc/merge-upstream
...
Conflicts:
- `.prettierignore`:
Upstream added a file, glitch-soc had extra files.
Took upstream's changes and moved glitch-soc's additions at the end.
2025-06-26 18:04:37 +02:00
Claire
2e0a00ab46
Fix search operators sometimes getting lost ( #35190 )
2025-06-26 10:35:49 +00:00
Claire
93bdb16817
Merge commit '8ba1487f30685fff4555a7537d3e6c765c73a07c' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/models/concerns/account/interactions_spec.rb`:
Conflict due to glitch-soc having modified specs ages ago.
The covered code is the same as upstream, though.
Took upstream's version of the specs.
- `spec/models/status_spec.rb`:
Conflict because glitch-soc tests for an extra glitch-soc-specific
method.
Added upstream's changes while keeping the glitch-soc method.
2025-06-24 22:43:43 +02:00
Matt Jankowski
36f01af6c4
Add Status#only_reblogs scope for annual report classes ( #35141 )
2025-06-24 06:54:55 +00:00
Matt Jankowski
ebc6897afb
Extract method to DRY up month/year grouping in AnnualReport::TimeSeries class ( #35113 )
2025-06-23 12:18:29 +00:00
Claire
f8f458e5e6
Merge commit '0ec6c26af3d7dc9a0eeb5631ebb9f56b724aaa8e' into glitch-soc/merge-upstream
2025-06-20 12:01:02 +02:00
Matt Jankowski
b1fe35d7d2
Update rubocop to version 1.76.2 ( #35070 )
2025-06-18 09:54:17 +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
aa6d1d4ac1
Merge commit '629bb74451242060298c6fb305c5337002379cc2' into glitch-soc/merge-upstream
2025-06-11 18:55:03 +02: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
Claire
3d474807bf
Change “legacy” non-fast-tracked quote posts to not be displayed as such ( #34945 )
2025-06-05 13:53:57 +00:00
Claire
23ce6d326c
Merge commit '129e72b91494f30777cf4fa8a0905de2dccedba7' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/formatting_helper.rb`:
Upstream removed OTel instrumentation around some code modified in glitch-soc
because of the Markdown rendering feature.
Removed the OTel instrumentation as upstream did.
2025-06-03 18:34:37 +02:00
Claire
129e72b914
Revert "Add telemetry for status / bio formatting ( #32677 )" ( #34906 )
2025-06-03 15:06:32 +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
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
064d333620
Fix inconsistent filtering of silenced accounts for other silenced accounts ( #34863 )
2025-05-30 13:20:51 +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
Darius Kazemi
991796172a
Fix NoMethodError in edge case of emoji cache handling ( #34749 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com >
2025-05-28 09:39:55 +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
