Claire
222dfdf233
Merge commit '8f1847df31f5195abb427854fa1e2bf1e8ba23a0' into glitch-soc/stable-4.6
2026-09-15 15:29:20 +02:00
Kazuki Nagasawa
c4294945a9
Fix relative privacy policy links in subscription emails ( #40486 )
2026-09-15 10:23:32 +02:00
Claire
3ee37e05f9
Fix submitting a status twice leading to a 500 error ( #40439 )
2026-09-15 10:23:32 +02:00
Claire
f6ad213192
Fix account deletion not deleting generated annual reports ( #40394 )
2026-09-15 10:23:32 +02:00
Claire
db101e1331
Fix notifications not being cleaned up when notification requests are deleted in bulk ( #40393 )
2026-09-15 10:23:32 +02:00
Claire
3a5da4cb92
Merge commit '5e1ec8b18a48b36b0fc66f04292df9c519b21883' into glitch-soc/stable-4.6
2026-09-01 16:07:09 +02:00
Claire
f7cf4e4dd2
Fix GHSA-vx32-x96w-qq65
2026-09-01 14:33:36 +02:00
Juan Hernández Babón
63eae9292e
Fixes GHSA-62j4-hvj7-px3f
2026-09-01 14:33:35 +02:00
David Roetzel
1fcb02d612
Add another permission check to admin area ( #39974 )
2026-09-01 14:33:35 +02:00
Claire
c787435a21
Fix invited-without-approval-bypass not being asked for a textual reason ( #40332 )
2026-09-01 14:30:52 +02:00
Claire
2db065960d
Merge commit '70ca3d5ee7042810636f7270ce942ad176a98209' into glitch-soc/merge-4.6
2026-08-28 19:05:15 +02:00
Claire
70ca3d5ee7
Add some spec coverage ( #40306 )
2026-08-28 15:44:22 +02:00
Claire and Shlee
3ccfbbe195
Fix various off-by-one errors in statistics time ranges ( #40193 )
...
Co-authored-by: Shlee <github@shl.ee >
2026-08-21 18:04:11 +02:00
Claire
1403a21fe8
Merge commit 'd74bbd9a3c64740433e016dfc936e83d710858f6' into glitch-soc/merge-4.6
2026-08-13 18:41:35 +02:00
Claire
77b7951de8
Fix domain block impact queries being rejected ( #40122 )
2026-08-13 14:42:43 +02:00
Claire
53bad36955
Merge commit '1440d55b139e39ec722c2a3db7f60b66cd889048' into glitch-soc/merge-4.6
2026-08-06 18:09:08 +02:00
David Roetzel
07a8dfa32c
Improve enforcement of collection item limit ( #39969 )
2026-08-06 11:41:22 +02:00
Claire
2be3994558
Merge commit '930aa9fee26bf9eaefe27826fa1061288d83373b' into glitch-soc/stable-4.6
2026-07-27 16:05:45 +02:00
Claire
930aa9fee2
Merge commit from fork
...
* Fix GHSA-7jvv-fhmg-wpfw
* Fix GHSA-hx34-2pfw-2qfj
* Fix GHSA-vwhj-3g83-v276
* Bump version to v4.6.4
2026-07-27 16:02:01 +02:00
Claire
895563ec41
Merge commit 'fe7c6beb618da69da8d41dccd064dea1546bd391' into glitch-soc/merge-4.6
2026-07-24 19:09:29 +02:00
Claire
095fc847f1
Fix performance of user-focused queries in admin dashboard ( #39929 )
2026-07-24 09:12:15 +02:00
Claire
5ed695d4f3
Merge commit '35fce54cc29466b848eef9b721be810f77fd78f2' into glitch-soc/merge-4.6
...
Conflicts:
- `app/lib/activitypub/parser/status_parser.rb`:
Upstream refactored this class while glitch-soc had an additional method.
Moved the private methods as upstream did while keeping glitch-soc's extra one.
- `spec/lib/activitypub/activity/create_spec.rb`:
glitch-soc had extra tests.
Added upstream's new tests alongside the glitch-soc-specific ones.
2026-07-22 18:58:43 +02:00
Claire
d813ddd1db
Fix Web Push subscription deletion endpoint incorrectly expecting anti-CSRF tokens ( #39918 )
2026-07-22 18:39:38 +02:00
Claire
503aee6be4
Fix ActivityPub::Activity::Create trying to re-create known statuses when author changes ( #39916 )
2026-07-22 18:39:38 +02:00
Claire
61a1238bd7
Fix lax relevancy check in inbound activity processing ( #39892 )
2026-07-22 18:39:38 +02:00
Claire
f90b89b7a9
Fix Account::Merging concern not supporting Quotes or Collections, refactor it ( #39884 )
2026-07-21 14:41:15 +02:00
Claire
1285172f2a
Merge commit 'd7bb36a64a842dfac52fb1cfb0fcd6646981fb38' into glitch-soc/merge-4.6
2026-07-19 11:29:44 +02:00
Claire
d7bb36a64a
Fix not being able to edit quote post text ( #39837 )
2026-07-16 14:47:44 +02:00
Claire
bdd2053e7a
Rename ASSOCIATIONS_ON_SUSPEND to ASSOCIATIONS_ON_PURGE ( #39831 )
2026-07-16 14:47:44 +02:00
David Roetzel
e23c2d246c
Remove collections when user is suspended ( #39809 )
2026-07-16 14:47:44 +02:00
Claire
f2e61fbd56
Fix error handling in ActivityPub::ProcessFeaturedItemService ( #39787 )
2026-07-16 14:47:44 +02:00
Claire
8941f1f98c
Merge commit '06d64519da4c6fc50536744f0d950dae22c6e2b9' into glitch-soc/merge-4.6
2026-07-02 18:31:59 +02:00
Matt Jankowski
635764b72f
Add missing to_json to publish announcement reaction worker ( #39685 )
2026-07-02 14:14:43 +02:00
Claire
2f491f0d48
Merge commit 'b5e771b89e7b55b9feb301d257e2d4dc7ca46c1d' into glitch-soc/merge-4.6
...
Conflicts:
- `lib/mastodon/version.rb`:
Upstream bumped the Mastodon API version.
Did it as well.
2026-06-23 18:01:59 +02:00
David Roetzel
b06e9f5a5e
LDAP: Fix attempted modification of frozen hash ( #39571 )
2026-06-23 17:35:29 +02:00
David Roetzel
e38abc3801
Add scheduler job to repair collection attribution ( #39550 )
2026-06-23 11:17:55 +02:00
David Roetzel
052d6bb173
Add check for wrong attribution of collections ( #39525 )
2026-06-23 11:17:54 +02:00
David Roetzel
7608436b64
Add route constraint to only allow numeric ids ( #39523 )
2026-06-23 11:17:54 +02:00
Claire
2a80a07854
Fix fetching unknown key when it's not the actor's first, and add error handling for unavailable keys ( #39512 )
2026-06-23 11:17:54 +02:00
Claire
6b4e8c7467
Merge commit 'e8642389912b1059c921f0836825f12a0f2779db' into glitch-soc/merge-4.6
...
Conflicts:
- `app/models/account.rb`:
Upstream changed the display name length limit for local users,
but glitch-soc has a configurable limit.
Updated the default limit to be upstream's new limit.
2026-06-17 14:40:25 +02:00
Matt Jankowski
41ea9ad128
Handle missing sw.js in test environment assets ( #39459 )
2026-06-17 12:09:12 +02:00
Claire
6aca68e185
Merge commit 'e2b7096bd3f93afcf4d6b3e7ffb9ccdb417a9def' into glitch-soc/merge-4.6
2026-06-16 21:49:17 +02:00
David Roetzel
dc53b0e077
Destroy dependent notifications of a collection ( #39429 )
2026-06-15 17:01:10 +02:00
Claire
61c56d4fd3
Merge pull request #3486 from ClearlyClaire/glitch-soc/drop-local-emoji
...
Completely drop support for the infamous local-only emoji
2026-06-12 19:16:32 +02:00
Claire
08027edb10
Merge commit 'b902c825054b953599cd0341acf428332fca5044' into glitch-soc/merge-upstream
2026-06-12 18:37:02 +02:00
Matt Jankowski
c0ee6f33c5
Add basic coverage for MuteWorker job ( #39384 )
2026-06-12 08:14:46 +00:00
Pia B.
35f3748482
Add import for custom filters ( #39256 )
2026-06-11 16:32:46 +00:00
Claire
bbbbb24dbd
Merge commit '96e23af89258068d05cc8557df914b4a9add385b' into glitch-soc/merge-upstream
2026-06-11 13:26:25 +02:00
Matt Jankowski
b09af1b465
Add basic coverage for EmailDistributionWorker behavior ( #39364 )
2026-06-11 07:54:15 +00:00
Claire
89c2ac444f
Merge commit '9e0a3aaf08e7d4fc700f7f19d61f5f8fee346b6a' into glitch-soc/merge-upstream
2026-06-10 18:52:58 +02:00
Claire
Kazuki Nagasawa
Juan Hernández Babón
David Roetzel
Matt Jankowski
Pia B.