Claire
7e25f6b606
Merge commit '6ad0ddebe4be9fb76b9119924674b4679e8da74a' into glitch-soc/merge-upstream
2025-08-26 19:07:52 +02:00
Matt Jankowski
a8166d28ed
Add coverage for "live TOS" and "no TOS" paths in tos/drafts spec ( #35902 )
2025-08-26 08:43:43 +00:00
Matt Jankowski
4f41b7c089
Relax hard-coded attr names in system specs ( #35903 )
2025-08-26 08:23:45 +00:00
Claire
496370801a
Add quotes_count to serializer specs ( #35901 )
2025-08-25 15:49:52 +00:00
Claire
f3a932d8a1
Add quoted_update notification type ( #35820 )
2025-08-25 15:44:18 +00:00
Claire
a44b4e220e
Merge commit 'f6e822e1f5c18553db246991ebfb8658acaef59f' into glitch-soc/merge-upstream
2025-08-24 11:43:25 +02:00
Matt Jankowski
20bc34ca52
Rely on pluck for the SELECT in RuleTranslation.languages ( #35826 )
2025-08-22 23:58:40 +00:00
Claire
71cee3e472
Merge commit 'f16f8b51b863d3fcadd17753004adbf8962ead01' into glitch-soc/merge-upstream
...
Conflicts:
- `yarn.lock`:
Upstream updated a dependency adjacent to one that is only in glitch-soc.
Updated as upstream did.
2025-08-19 18:46:12 +02:00
Matt Jankowski
ce813ad144
Avoid method that makes tokens while checking for tokens ( #35815 )
2025-08-19 06:49:34 +00:00
Claire
4ffcf7f7ed
Merge commit '255d8f3f8c6ece6a9f1fce9ea901d71577b92099' into glitch-soc/merge-upstream
2025-08-18 22:05:19 +02:00
Claire
255d8f3f8c
Fix e-mail confirmation bypassing username approval ( #35806 )
2025-08-18 16:37:13 +00:00
Claire
8d602df786
Merge commit '72bd1ed4b3df9188a1ad3e664c86fe2e928bd134' into glitch-soc/merge-upstream
2025-08-18 13:44:06 +02:00
Claire
72bd1ed4b3
Fix updates to quote policy not being federated ( #35804 )
2025-08-18 08:34:45 +00:00
Matt Jankowski
9d15b85d3b
Include update in the resources args for api/web/push_subscriptions route ( #35801 )
2025-08-18 07:35:56 +00:00
Claire
4d9150735a
Merge commit '651e51a82eba542c4d8c3fec5edd16420ea1ff3e' into glitch-soc/merge-upstream
...
Conflicts:
- `yarn.lock`:
Upstream updated a dependency textually adjacent to a glitch-soc-specific one.
Updated the dependency as upstream did.
2025-08-17 20:52:34 +02:00
Claire
a2cddb9eac
Disallow making private posts quotable ( #35780 )
2025-08-14 13:58:25 +00:00
Claire
b0ce1ce49d
Fix tootctl admin create not bypassing reserved username checks ( #35779 )
2025-08-14 13:35:19 +00:00
Matt Jankowski
93923a4af2
First pass coverage addition for antispam class ( #35771 )
2025-08-14 07:57:18 +00:00
Claire
2648bbdc51
Add PUT /api/v1/statuses/:status_id/interaction_policy ( #35769 )
2025-08-13 15:51:16 +00:00
Echo
7cf53dbf63
Redirect on success for standalone compose ( #35763 )
2025-08-13 13:52:29 +00:00
Claire
258e5c4938
Fix interaction policy changes in implicit updates not being saved ( #35751 )
2025-08-12 12:19:29 +00:00
Claire
8a7e84a475
Add test for Delete of inlined QuoteAuthorization ( #35724 )
2025-08-11 08:55:23 +00:00
Claire
0e99d428b2
Change serialization of Delete activities for QuoteAuthorization to inline the latter ( #35725 )
2025-08-11 08:55:18 +00:00
Matt Jankowski
b827a0a6a8
Allow CustomEmoji to normalize its own domain ( #35726 )
2025-08-11 07:33:36 +00:00
Claire
11902d958f
Merge commit 'ce1680e6f979889ebd5c775353f3b82a8b2698bb' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/concerns/user/has_settings.rb`:
Upstream added a new helper for a setting, where glitch-soc had extra ones.
Not a real conflict, added upstream's new helper without removing glitch-soc's ones.
2025-08-09 23:02:43 +02:00
David Roetzel
868c46bc76
Add delivery failure handling to FASP jobs ( #35723 )
2025-08-08 09:46:09 +00:00
Claire
e68de292b4
Merge commit 'a485f97d21c3fb7da927e8fd239b301a590ee9b8' into glitch-soc/merge-upstream
2025-08-07 18:16:54 +02:00
Matt Jankowski
a485f97d21
Replace EmailHelper module with normalizes via model concern ( #35702 )
2025-08-07 13:47:47 +00:00
Claire
496a5f423e
Inline instrument quote post in outgoing QuoteRequest activities ( #35713 )
2025-08-07 13:19:18 +00:00
Claire
836a2bfee0
Fix handling of inlined instrument in incoming QuoteRequest ( #35714 )
2025-08-07 12:52:29 +00:00
Claire
235037a3b2
Merge commit 'ac59772dc6cda646258e61debfd792f9057c1c39' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/api/v1/statuses_controller.rb`:
Conflict because upstream added a parameter where glitch-soc had an extra one.
Added upstream's parameter while keeping glitch-soc's.
- `app/serializers/activitypub/note_serializer.rb`:
Conflict because upstream added an extension where glitch-soc had an extra one.
Added upstream's extension while keeping glitch-soc's.
- `app/services/update_status_service.rb`:
Conflict because upstream added a parameter where glitch-soc had an extra one.
Added upstream's parameter while keeping glitch-soc's.
2025-08-06 22:02:55 +02:00
Claire
9ec99ffef1
Add quote_approval_policy parameter when posting and editing statuses ( #35699 )
2025-08-06 14:23:12 +00:00
Matt Jankowski
6e48322055
Add spec for CanonicalEmailBlock.matching_email scope ( #35692 )
2025-08-06 12:19:43 +00:00
Claire
c8f263c419
Export interaction policies for local posts over ActivityPub ( #35697 )
2025-08-06 11:31:36 +00:00
Matt Jankowski
4c2ddbf2c4
Update rubocop to version 1.79.2 ( #35688 )
2025-08-06 08:42:53 +00:00
Claire
3f166bb068
Merge commit 'ffeb5da9912a3b7db0deb8aec429e661ef609c59' into glitch-soc/merge-upstream
2025-08-05 15:46:33 +02:00
Claire
1fd3510b32
Change the quote revocation REST API endpoint to return updated quote post ( #35677 )
2025-08-05 09:42:58 +00:00
Matt Jankowski
8131268256
Replace unprocessable_entity -> unprocessable_content ( #35658 )
2025-08-05 07:42:08 +00:00
Claire
53185f5381
Merge commit '081d38679f965ac20ff1a6c72e2fc1108c34ac30' into glitch-soc/merge-upstream
2025-08-04 21:24:47 +02:00
Claire
32791c9745
Accept remote quotes of local quotes according to set policy ( #35629 )
2025-08-04 15:27:46 +00:00
David Roetzel
eb273f904f
Make WorkerBatch spec more robust ( #35656 )
2025-08-04 14:04:40 +00:00
Claire
80aadc55df
Add missing mailer for quote notifications ( #35652 )
2025-08-04 10:44:59 +00:00
David Roetzel
05cdd3f6eb
Track delivery failures to FASP ( #35628 )
2025-08-04 07:43:34 +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
Matt Jankowski
483da67204
Remove unused obscured_counter helper method ( #35627 )
2025-08-01 14:28:45 +00:00
David Roetzel
fba24cc4eb
Add minute resolution to DeliveryFailureTracker ( #35625 )
2025-08-01 13:29:22 +00:00
Claire
2dfdcc7dcb
Add API endpoints to view and revoke one's quoted posts ( #35578 )
2025-07-31 09:36:51 +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
