Claire
572f18c322
Merge commit '664efcf4c3f9713894054fb642a252d8752a4123' into glitch-soc/merge-upstream
2026-03-25 21:09:30 +01:00
Matt Jankowski
52a8bf4118
Add constants for delay in services ( #38375 )
2026-03-25 09:59:38 +00:00
Claire
3d8e40f7c9
Merge commit 'c72ca33fac1ae1518371f5954ae9487692b17709' into glitch-soc/merge-upstream
2026-03-24 17:05:53 +01:00
Claire
4559e4ed1a
Merge commit from fork
2026-03-24 15:44:08 +01:00
Claire
60236bffe6
Merge commit '0ef43a431d353a17419ea6664ed745b5dbfbf2f9' into glitch-soc/merge-upstream
2026-03-24 12:13:39 +01:00
Claire
39d9da3b82
Tag linked FeaturedCollection objects over ActivityPub ( #38115 )
2026-03-23 13:11:33 +00:00
Claire
04bf07a9cf
Merge commit 'c37bc5a8a94758e19b2d50db5e7816a96cec5cf4' into glitch-soc/merge-upstream
2026-03-17 18:01:07 +01:00
Matt Jankowski
653161fecc
Convert remaining JSON.generate ( #38240 )
2026-03-16 17:18:16 +00:00
Claire
b96c8ecff4
Merge commit '89c1b9a8fdfe38881ad1b6c22f20240b087aa993' into glitch-soc/merge-upstream
2026-01-26 18:09:54 +01:00
Claire
1b748eaeb0
Fix irrelevant accounts being passed through silenced_account_ids to DistributionWorker ( #37589 )
2026-01-26 09:26:19 +00:00
Claire
95aaefe083
Merge commit '562ea656f495f0619e393b7d93bd07c5abd28e5a' into glitch-soc/merge-upstream
2026-01-21 22:04:02 +01:00
Claire
e7c6600d83
Fix cross-server conversation tracking ( #37559 )
2026-01-21 12:02:41 +00:00
Claire
48ec31bec8
Merge commit '4896d2c4c6d3bd6b878c5a075b6611c65d4203b2' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
Upstream changed stuff too close to glitch-soc's theming system changes.
Applied upstream's changes.
- `streaming/index.js`:
Upstream refactored a bunch of stuff where our code was different due to
local-only posts.
Applied upstream's changes while taking care of local-only posts.
2025-10-28 22:10:12 +01:00
Claire
8fb524e07f
Add support for Update of converted object types ( #36322 )
2025-10-28 14:05:14 +00:00
Claire
490c89a5a9
Merge commit 'c858fc77ef194be0217fd98eae84efd261dba798' into glitch-soc/merge-upstream
2025-10-09 17:59:13 +02:00
Claire
d4a4a7177a
Fix crash when serializing quotes of deleted posts for ActivityPub ( #36381 )
2025-10-09 13:52:38 +00:00
Claire
cc52833296
Merge commit '38fa0102c111f1c0cff5a42eba6882ffae4ca109' into glitch-soc/merge-upstream
2025-09-15 18:39:09 +02:00
Claire
e4bb0fc43a
Add server-side support for handling posts with a quote policy allowing followers to quote ( #36127 )
2025-09-15 15:03:44 +00:00
Claire
5da295fa4d
Merge commit '06803422da3794538cd9cd5c7ccd61a0694ef921' into glitch-soc/merge-upstream
2025-09-13 11:12:22 +02:00
Claire
82b26603fe
Fix quote posts with CW and no text being rejected ( #36095 )
2025-09-12 13:10:31 +00:00
Claire
53185f5381
Merge commit '081d38679f965ac20ff1a6c72e2fc1108c34ac30' into glitch-soc/merge-upstream
2025-08-04 21:24:47 +02:00
Claire
0153a239db
Avoid nested transactions when fetching quote posts ( #35657 )
2025-08-04 14:34:05 +00:00
Claire
5ed9410de0
Disable ActiveRecord query cache in Create critical path ( #35662 )
2025-08-04 14:15:02 +00:00
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
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
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
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
d14d7a5379
Merge commit 'aedc5f692144aa36245fe47c277bb5ad4766a335' into glitch-soc/merge-upstream
2025-05-05 20:31:48 +02:00
Claire
cbaba54e9d
Add support for importing embedded self-quotes ( #34584 )
2025-05-05 08:01:16 +00:00
Claire
3ec3814f8e
Merge commit '715cbee93d419e26cf952bf7fc70f9c1cc217d8b' into glitch-soc/merge-upstream
2025-05-03 17:37:26 +02:00
Claire
9ed6a14d45
Add support for ingesting quote policies ( #34479 )
2025-04-28 08:48:27 +00:00
Claire
ace0a3d61f
Merge commit 'b33f9ea60338a78dde2fb7fe3f083c2ffaafcf1f' into glitch-soc/merge-upstream
2025-04-21 15:22:22 +02:00
Claire
df2611a10f
Add initial support for ingesting and verifying remote quote posts ( #34370 )
2025-04-17 07:45:23 +00:00
Claire
99e3ea232f
Merge commit '5f87ae101c5e0e940e148d493eaac1ce31fe24c1' into glitch-soc/merge-upstream
2025-04-04 20:00:24 +02:00
Claire
dd23ba9c83
Refactor local-URI-to-account resolving ( #34349 )
2025-04-02 14:44:09 +00:00
Claire
b330cc21c4
Merge commit 'aff51823752b809c3349698b6be02bfdda7a9010' into glitch-soc/merge-upstream
2025-03-12 19:48:51 +01:00
Claire
966b816382
Refactor ActivityPub::FetchRepliesService and ActivityPub::FetchAllRepliesService ( #34149 )
2025-03-12 11:52:38 +00:00
Claire
0aa69487a2
Merge commit '877090518682b6c77ba9bdfa0231afd56daec44d' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/concerns/user/has_settings.rb`:
Not a real conflict, upstream added a setting textually close to a glitch-soc one.
Added upstream's new setting.
- `app/views/settings/preferences/appearance/show.html.haml`:
Not a real conflict, upstream added a setting textually close to a glitch-soc one.
Added upstream's new setting.
- `config/routes.rb`:
Upstream moved web app routes to `config/routes/web_app.rb`, while glitch-soc had
an extra route.
Moved the extra route to `config/routes/web_app.rb`.
- `spec/controllers/settings/preferences/appearance_controller_spec.rb`:
This spec got converted to a system spec upstream.
However, the theme setting works differently in glitch-soc, so the spec had been
changed.
Changed the corresponding system spec as well.
2024-12-25 18:01:37 +01:00
Claire
344e2903b3
Fix featured tags for remote accounts not being kept up to date ( #33372 )
2024-12-20 11:50:31 +00:00
Claire
f624ef2778
Merge commit 'b06fd54c305915527e3a6edc575dc23b623143ef' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/formatting_helper.rb`:
Upstream wrapped some code glitch-soc had modified in an OTEL instrumentation span.
Wrapped the modified code.
2024-11-03 20:51:58 +01:00
Jonny Saunders
9074c1fac9
Use likes and shares totalItems on status creations and updates ( #32620 )
2024-10-28 04:55:18 +00:00
Claire
4d9b4ef72f
Merge commit '7c10b0fb7a078661558fef86399d86831423260c' into glitch-soc/merge-upstream
2024-10-14 19:46:52 +02:00
Matt Jankowski
258dce1256
Add OpenSSL::SSL::SSLError to http connection errors wrapper ( #32307 )
2024-10-08 14:59:51 +00:00
Matt Jankowski
e8ec6667bd
Extract wrapper constant for HTTP::* error classes ( #32285 )
2024-10-08 13:53:35 +00:00
Claire
b28ce2424c
Merge commit 'c40ab43dc703be988c277d4ba6b7987a3a80e16c' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/application_helper.rb`:
Upstream added a helper where glitch-soc had its own, not really
a conflict.
Added upstream's helper.
- `lib/sanitize_ext/sanitize_config.rb`:
Upstream renamed a constant that was used slightly differently in glitch-soc.
Renamed it as upstream did.
2024-10-06 16:07:58 +02:00
Jeong Arm
66b2bc1c84
Ignore error if mentioned account was not processable ( #29215 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-10-02 08:08:02 +00:00
