Claire
ef413ef713
Merge commit '5a8ab0a3e62a8825e28bb74c1760ba6488d20c97' into glitch-soc/merge-upstream
2025-10-15 16:35:37 +02:00
Claire
264d068d8d
Change new accounts to use new ActivityPub numeric ID scheme ( #36365 )
2025-10-14 16:36:55 +00:00
Claire
af82db5271
Merge commit 'edd7fd98722a0d49ea486aa790a186735e491f35' into glitch-soc/merge-upstream
2025-10-13 18:07:08 +02:00
Eugen Rochko
33f739da44
Fix permalink redirects continuing to work for suspended accounts ( #36453 )
2025-10-13 15:18:01 +00:00
Claire
8921494571
Merge commit '7e98fa9b476fdaed235519f1d527eb956004ba0c' into glitch-soc/merge-upstream
2025-10-13 14:26:11 +02:00
Emelia Smith
24dcb18013
Merge commit from fork
...
* Ensure tootctl revokes sessions, access tokens and web push subscriptions
* Fix test coverage
2025-10-13 14:20:23 +02: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
f800057008
Merge commit 'b8444d9bb7885d75112a3cae74b6a5c711c7d547' into glitch-soc/merge-upstream
2025-10-08 18:07:04 +02:00
Claire
0be0a8898a
Fix Update/Delete of quoted status not being forwarded to quoters's followers ( #36390 )
2025-10-08 12:56:32 +00:00
Claire
b6c53c1129
Merge commit '150f0fcba5585782e2cac49d971904f02d5e6fbd' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/follower_accounts_controller.rb`:
Upstream refactored a part of the code where glitch-soc has changed the code
to potentially hide followers count.
Adapt upstream's changes.
2025-09-29 18:41:46 +02:00
Claire
150f0fcba5
Add support for numeric-based URIs for local accounts ( #32724 )
2025-09-29 12:05:48 +00:00
Claire
106b0a9d93
Merge commit 'a44a3f6d4047568921469ff9fbd212f553b1e7f4' into glitch-soc/merge-upstream
2025-09-27 21:46:57 +02:00
Claire
a44a3f6d40
Expand test coverage of ActivityPub::TagManager class ( #36260 )
2025-09-26 10:00:53 +00:00
Claire
b15b07606c
Merge commit '28be5a199f685b9fb26742c4d78ddca53df05d57' into glitch-soc/merge-upstream
2025-09-24 18:26:13 +02:00
Claire
e1f7847b64
Remove the outgoing_quotes feature flag, making the feature unconditional ( #36130 )
2025-09-24 08:58:08 +00:00
Claire
880e662a60
Merge commit '854aaec6fe69df02e6d850cb90eef37032b4d72f' into glitch-soc/merge-upstream
2025-09-19 18:18:56 +02:00
Matt Jankowski
854aaec6fe
Spec for newline in request lib initialize ( #36170 )
2025-09-19 15:22:23 +00:00
Claire
b6bc42aaa6
Fix getting Create and Update out of order ( #36176 )
2025-09-19 08:45:13 +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
128a69c1f4
Merge commit '75f78244d5df52cc8242b6a7c6b8d1531963aa63' into glitch-soc/merge-upstream
2025-09-11 12:13:47 +02:00
Yamagishi Kazutoshi
ffaa672fd6
Display Valkey version on admin dashboard ( #35785 )
2025-09-10 10:58:51 +00:00
Claire
d5b959a2ca
Merge commit '75fca715e9ae8ad347edbaf6511a052f161a3de3' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/settings/preferences/other/show.html.haml`:
Upstream moved some preferences to a new category, while glitch-soc had an
extra preference there.
Moved the extra preference like upstream did to the new category.
2025-09-02 19:07:51 +02:00
Eugen Rochko
7fc884ba00
Fix banned text being able to be circumvented via unicode ( #35978 )
2025-09-02 07:29:03 +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
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
8a7e84a475
Add test for Delete of inlined QuoteAuthorization ( #35724 )
2025-08-11 08:55:23 +00:00
Claire
e68de292b4
Merge commit 'a485f97d21c3fb7da927e8fd239b301a590ee9b8' into glitch-soc/merge-upstream
2025-08-07 18:16:54 +02:00
Claire
836a2bfee0
Fix handling of inlined instrument in incoming QuoteRequest ( #35714 )
2025-08-07 12:52:29 +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
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
David Roetzel
fba24cc4eb
Add minute resolution to DeliveryFailureTracker ( #35625 )
2025-08-01 13:29:22 +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
Matt Jankowski
038de44110
Fix Style/GuardClause in Webfinger lib ( #35532 )
2025-07-28 08:38:55 +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
Claire
eeffe580d8
Merge commit '74fc4dbacf5a9168074e91fc2d75309dc42ff1ed' into glitch-soc/merge-upstream
2025-07-15 18:19:32 +02:00
Claire
594976a538
Refactor ActivityPub::Activity::Accept and ActivityPub::Activity::Reject specs ( #35382 )
2025-07-15 13:18:37 +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
f9beecb343
Improve Accounts CLI prune spec ( #35302 )
2025-07-10 07:23:09 +00:00
Claire
3efc857fbc
Merge commit '8ee6cee36e313fcc39763210dfcd3b871b47cacb' into glitch-soc/merge-upstream
2025-07-08 16:41:01 +02:00
David Roetzel
1fa72d6c44
Raise better exception on FASP error responses ( #35262 )
2025-07-04 07:25:42 +00: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
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
