Claire
2b0b537152
Merge commit 'c49e261ad07d46515af50cdf103524ecf554b2f8' into glitch-soc/merge-4.4
2025-11-19 22:29:14 +01:00
Claire
8f5e95a159
Fix Update importing old previously-unknown activities and treating them as recent ones ( #36848 )
2025-11-19 13:50:16 +01:00
Claire
7f7d6697c1
Merge commit 'c2fb12d22d52872b5905822c3d05f65516fa7f1d' into glitch-soc/merge-4.4
2025-10-21 15:14:15 +02:00
Claire
2dc4552229
Merge commit from fork
...
* Add validation to reject quotes of reblogs
* Do not process quotes of reblogs as potentially valid quotes
* Refuse to serve quoted reblogs over REST API
2025-10-21 15:00:28 +02:00
Claire
7c46fdfbf1
Merge commit '8965e1bfa9ce958ab16083a555ec6677b5f0f690' into glitch-soc/merge-4.4
2025-10-15 11:16:53 +02:00
Claire
1e27ab0885
Fix moderation warning e-mails that include posts ( #36462 )
2025-10-14 17:15:58 +02:00
Claire
81cf6715de
Merge commit 'd7f4eca801bb702f487287eb218a9e7a133ee341' into glitch-soc/merge-4.4
2025-10-13 15:56:31 +02:00
Claire
d7f4eca801
Fix streaming still being authorized for suspended accounts ( #36449 )
2025-10-13 15:35:58 +02:00
Claire
1631fb80e8
Merge commit from fork
...
* Ensure tootctl revokes sessions, access tokens and web push subscriptions
* Fix test coverage
---------
Co-authored-by: Emelia Smith <ThisIsMissEm@users.noreply.github.com >
2025-10-13 14:20:23 +02:00
Claire
8477bec2f2
Merge commit from fork
...
* Streaming: Ensure disabled users cannot connect to streaming
* Streaming: Disconnect when the user is disabled
---------
Co-authored-by: Emelia Smith <ThisIsMissEm@users.noreply.github.com >
2025-10-13 14:19:14 +02:00
Claire
21d4abf7cc
Merge commit 'd7d6407d4196ab6783485b20a3d9e2fbfc00ef01' into glitch-soc/merge-4.4
2025-10-09 18:15:33 +02:00
Claire
d7d6407d41
Explicitly record Tombstone quotes as deleted
...
This adds a `deleted` state to the internal representation, but this does
not change the API, which already included such a state.
2025-10-09 17:37:23 +02:00
Claire
a186bad399
Fix "quote": { "type": "Tombstone" } being ignored
2025-10-09 17:37:23 +02:00
Matt Jankowski
d9113976c8
Use tag filter for pending tag count on admin dashboard ( #36404 )
2025-10-09 17:37:23 +02:00
Claire
0e7cb713d1
Merge commit '670316499fb4439a28d93aca2f40617dfb9bb2b0' into glitch-soc/merge-4.4
2025-10-08 18:00:57 +02:00
Emelia Smith
4c12c2ed60
Add integration tests for mastodon-streaming ( #36025 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com >
Co-authored-by: David Roetzel <david@roetzel.de >
2025-10-08 16:26:13 +02:00
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
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
fiona
c0f9e7f4c3
Fix handling of edited status with new media and no text ( #35970 )
2025-09-04 10:45:54 +02:00
Matt Jankowski
97f118013a
Include update in the resources args for api/web/push_subscriptions route ( #35801 )
2025-09-04 10:45:54 +02:00
Claire
ea5d1f0297
Fix tootctl admin create not bypassing reserved username checks ( #35779 )
2025-09-04 10:45:54 +02:00
Matt Jankowski
7a862d3308
First pass coverage addition for antispam class ( #35771 )
2025-09-04 10:45:54 +02:00
Echo
1675eab561
Redirect on success for standalone compose ( #35763 )
2025-09-04 10:45:54 +02:00
Claire
5f4116a311
Fix interaction policy changes in implicit updates not being saved ( #35751 )
2025-09-04 10:45:54 +02:00
Claire
0741381670
Add test for Delete of inlined QuoteAuthorization ( #35724 )
2025-09-04 10:45:54 +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
208cb8276a
Fix friends-of-friends recommendations suggesting already-requested accounts ( #35604 )
2025-08-01 11:34:27 +02:00
Claire
8242f06eca
Add restrictions on which quote posts can trend ( #35507 )
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
e69c1479a8
Merge commit '77d2cdb30230ae6292bd247f6c6f97d00bd38084' into glitch-soc/backports-4.4
2025-07-23 18:10:05 +02:00
Claire
da0cc0f5b9
Fix support for quote verification in implicit status updates ( #35384 )
2025-07-23 16:08:43 +02:00
Claire
7ae78b1032
Refactor ActivityPub::Activity::Accept and ActivityPub::Activity::Reject specs ( #35382 )
2025-07-23 16:08:43 +02:00
Claire
ec6f93ae45
Merge commit '609a40181e0f3f505707d196985dfb78ab3b3f88' into glitch-soc/merge-4.4
2025-07-09 17:31:28 +02:00
Claire
1151b05c2d
Fix support for special characters in various environment variables ( #35314 )
...
Co-authored-by: Matt Jankowski <matt@jankowski.online >
2025-07-09 17:16:57 +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
Matt Jankowski
b4a950c2fc
Remove unused scopes in Account model ( #35276 )
2025-07-07 17:48:13 +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
Matt Jankowski
025abf7325
Fix intermittent failure of TOS model spec from effective date collision ( #35244 )
2025-07-04 15:10:17 +02:00
Claire
42884d8727
Fix error handling for blank actions in account moderation action form ( #35246 )
2025-07-04 15:10:17 +02:00
Matt Jankowski
961c22a6fd
Add coverage for TOS interstitial interruption flow of web app controller concern ( #35235 )
2025-07-04 15:10:17 +02:00
Matt Jankowski
041bce9ed6
Add coverage for valid_locale_or_nil languages helper method ( #34866 )
2025-07-04 15:10:17 +02:00
Claire
2eec4da8fc
Merge commit 'c357a7f8d697ede4df4be74456b0497118c9d049' into glitch-soc/merge-upstream
2025-06-30 17:52:22 +02:00
David Roetzel
c357a7f8d6
Add optional bulk mailer settings ( #35203 )
2025-06-30 14:49:14 +00:00
David Roetzel
bae258925c
Persist follow recommendations from FASP ( #35218 )
2025-06-30 13:39:36 +00:00
Claire
153af19f55
Add specs for PublicFileServer middleware ( #35219 )
2025-06-30 11:23:11 +00:00
