Claire
dbab707d64
Merge commit '591df1f205c654381203b56d46498efc62370776' into glitch-soc/merge-upstream
2025-08-01 22:11:59 +02:00
Claire
591df1f205
Add support for local quote stamps ( #35626 )
2025-08-01 14:55:25 +00:00
David Roetzel
fba24cc4eb
Add minute resolution to DeliveryFailureTracker ( #35625 )
2025-08-01 13:29:22 +00:00
Claire
572a0e128d
Change quote verification to not bypass authorization flow for mentions ( #35528 )
2025-07-31 07:39:53 +00:00
Claire
e53421b548
Merge commit 'e5826777b6c06a32b97388657beaca1e5eccb421' into glitch-soc/merge-upstream
...
Conflicts:
- `config/settings.yml`:
Not a real conflict, upstream removed settings that are identical in glitch-soc
but textually adjacent to glitch-soc-only settings.
Removed what upstream removed.
2025-07-30 20:05:45 +02:00
Claire
efc0d237af
Fix synchronous recursive fetching of deeply-nested quoted posts ( #35600 )
2025-07-30 14:39:30 +00:00
Claire
31ba52a57b
Change StatusReachFinder to consider quotes as well as reblogs ( #35601 )
2025-07-30 14:07:01 +00:00
Matt Jankowski
3146109b08
Add MediaAttachment.combined_media_file_size method ( #35570 )
2025-07-30 12:57:51 +00:00
Claire
3eca8cce1c
Add second set of blocked text that applies to accounts regardless of account age ( #35563 )
2025-07-29 08:59:16 +00:00
Matt Jankowski
2acc942bb4
Fix Style/GuardClause in WebfingerResource ( #35531 )
2025-07-28 08:39:11 +00:00
Matt Jankowski
038de44110
Fix Style/GuardClause in Webfinger lib ( #35532 )
2025-07-28 08:38:55 +00:00
Matt Jankowski
720ee96969
Move repeated snowflake ID gather to base classes ( #35554 )
2025-07-28 08:14:06 +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
Claire
5a88b7f683
Add experimental basic quote post authoring ( #35355 )
2025-07-25 12:35:24 +00:00
Matt Jankowski
2e35defeec
Update rubocop to version 1.79.0 ( #35502 )
2025-07-25 07:22:05 +00:00
Claire
1716f8da71
Merge commit '3b52dca4057560c58b260433722d91650fcd5040' into glitch-soc/merge-upstream
...
Conflicts:
- `app/serializers/initial_state_serializer.rb`:
Upstream added a `features` attribute where glitch-soc had extra ones.
Added `features` like upstream did.
2025-07-11 18:53:47 +02:00
Matt Jankowski
ad78701b6f
Mark private methods in AnnualReport::TopStatuses ( #35256 )
2025-07-10 07:35:40 +00:00
Matt Jankowski
1496488771
Add Status#not_replying_to_account scope for annual report classes ( #35257 )
2025-07-10 07:35:04 +00:00
Matt Jankowski
4ecfbd3920
Add Status.only_polls (and without polls) scope ( #35330 )
2025-07-10 07:13:22 +00:00
Claire
3efc857fbc
Merge commit '8ee6cee36e313fcc39763210dfcd3b871b47cacb' into glitch-soc/merge-upstream
2025-07-08 16:41:01 +02:00
David Roetzel
8ee6cee36e
Better error response to malformed headers ( #35278 )
2025-07-08 09:31:04 +00:00
David Roetzel
1fa72d6c44
Raise better exception on FASP error responses ( #35262 )
2025-07-04 07:25:42 +00: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
