tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
29,676 Commits 5 Branches 0 Tags
150ca70fa8fb7effb6491e50b8bb266346a146e8
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Claire f7991accd3 Change /api/v1/statuses/:id/history to always return at least one item (#25510) 2026-09-18 04:37:35 -04:00
Claire 0cdaab0fcd Fix AccountsStatusesCleanupScheduler not spreading deletes across accounts correctly (#24607) 2026-09-18 04:37:35 -04:00
Claire cf140fe7bf Change automatic post deletion thresholds and load detection (#24614) 2026-09-18 04:37:35 -04:00
Claire f606279e22 Fix ArgumentError when loading newer Private Mentions (#25399) 2026-09-18 04:37:35 -04:00
Claire ea302f3f16 Add mail headers to avoid auto-replies (#23597) 2026-09-18 04:37:35 -04:00
Claire 222dfdf233 Merge commit '8f1847df31f5195abb427854fa1e2bf1e8ba23a0' into glitch-soc/stable-4.6 2026-09-15 15:29:20 +02:00
Claire 8f1847df31 Bump version to v4.6.8 2026-09-15 15:12:01 +02:00
Claire cca43ce5d3 Fix canonical email blocks interfering with freezing or approving users (#40463) 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 5e1ec8b18a Bump version to v4.6.7 2026-09-01 14:34:19 +02:00
Claire f7cf4e4dd2 Fix GHSA-vx32-x96w-qq65 2026-09-01 14:33:36 +02:00
Claire d8e613a35c Fix GHSA-vgm8-frgh-rh2v 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 2a3680ee2e Update mail dependency 2026-09-01 14:30:52 +02:00
Claire c9fd621e94 Update activestorage dependency 2026-09-01 14:30:52 +02:00
Claire b33cc49abf Merge pull request #3647 from glitch-soc/glitch-soc/merge-4.6 
Merge upstream changes up to 70ca3d5ee7 into stable-4.6
 2026-08-28 20:07:59 +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 b7d841cdd8 Add the config/ directory to Bootsnap precompilation in Dockerfile (#40255) 2026-08-28 15:44:22 +02:00
Claire f2ec372418 Switch APT repos to canonical ubuntu repos rather than Azure mirror (#40205) 2026-08-21 18:04:11 +02:00
Claire a17c1b4658 Fix error when processing remote actors with null public keys (#40194) 2026-08-21 18:04:11 +02:00
ClaireandShlee 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 f1f3dd8720 Update security policy 2026-08-21 18:04:11 +02:00
Claire 17031f2d10 Merge pull request #3632 from glitch-soc/glitch-soc/merge-4.6 
Merge upstream changes up to d74bbd9a3c into stable-4.6
 2026-08-13 19:08:32 +02:00
Claire 1403a21fe8 Merge commit 'd74bbd9a3c64740433e016dfc936e83d710858f6' into glitch-soc/merge-4.6 2026-08-13 18:41:35 +02:00
Claire d74bbd9a3c Bump version to v4.6.6 2026-08-13 18:16:01 +02:00
Claire c76fd2b478 Update mastodon:setup task warning about trademark to match masto but ignore subdomains (#40143) 2026-08-13 14:42:43 +02:00
Claire b4121ff003 Wrap connection errors in Webfinger#perform (#40135) 2026-08-13 14:42:43 +02:00
Claire 170f23bb24 Fix Web UI being inaccessible with URLs ending with .zip (#40134) 2026-08-13 14:42:43 +02:00
Claire 77b7951de8 Fix domain block impact queries being rejected (#40122) 2026-08-13 14:42:43 +02:00
Claire 6f8664c82e Merge pull request #3619 from glitch-soc/glitch-soc/merge-4.6 
Merge upstream changes up to 1440d55b13 into stable-4.6
 2026-08-07 08:17:33 +02:00
Claire 53bad36955 Merge commit '1440d55b139e39ec722c2a3db7f60b66cd889048' into glitch-soc/merge-4.6 2026-08-06 18:09:08 +02:00
Claire 1440d55b13 Bump version to v4.6.5 2026-08-06 14:22:54 +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 cdca08ba07 Merge pull request #3601 from glitch-soc/glitch-soc/merge-4.6 
Merge upstream changes up to 9e5f298350 into stable-4.6
 2026-07-27 13:12:04 +02:00
Claire 66ccc19509 [Glitch] Fix being unable to vote in polls without an expiration date 
Port 42c01d703fdb87abd8c335624b83f2ac251967ac to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-07-27 12:48:11 +02:00
Claire 9b51e5af2b [Glitch] Fix “Hide media with a warning” filters not being applied correctly 
Port 1553ca26f27af816885970a02b2bf69b64748e46 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-07-27 12:48:11 +02:00
Claire 599ee0c31d Merge commit '9e5f298350d9b05dbb60ba122cd8cb72d40c8997' into glitch-soc/merge-4.6 2026-07-27 12:47:42 +02:00
Claire 9e5f298350 Fix being unable to vote in polls without an expiration date (#39949) 2026-07-27 12:26:07 +02:00
Claire 14108d2c06 Fix “Hide media with a warning” filters not being applied correctly (#39946) 2026-07-27 11:33:05 +02:00
Claire 8f480a7672 Merge pull request #3598 from glitch-soc/glitch-soc/merge-4.6 
Merge upstream changes up to fe7c6beb61 into stable-4.6
 2026-07-24 20:02:59 +02:00
Claire 895563ec41 Merge commit 'fe7c6beb618da69da8d41dccd064dea1546bd391' into glitch-soc/merge-4.6 2026-07-24 19:09:29 +02:00
Claire fe7c6beb61 Update dependency aws-sdk-s3 2026-07-24 10:56:14 +02:00
Claire 095fc847f1 Fix performance of user-focused queries in admin dashboard (#39929) 2026-07-24 09:12:15 +02:00
Claire 5fd76aa2e2 Merge pull request #3593 from glitch-soc/glitch-soc/merge-4.6 
Merge upstream changes up to 35fce54cc2 into stable-4.6
 2026-07-23 07:52:59 +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 af8d57c886 Update dependency rails-html-sanitizer 2026-07-21 14:41:15 +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 2ab060be0f Fix suspended accounts not being removed from follow request count in /api/v1/accounts/verify_credentials (#39858) 2026-07-21 14:41:15 +02:00
Claire 25223d6392 Merge pull request #3585 from glitch-soc/glitch-soc/merge-4.6 
Merge upstream changes up to d7bb36a64a into stable-4.6
 2026-07-19 15:54:59 +02:00
Claire 66419873fe [Glitch] Fix relative times 
Port 312400370506ba558c30dac6641b198fac0e1300 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-07-19 11:32:23 +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 e9c8401143 Update dependency websocket-driver 2026-07-16 14:47:44 +02:00
Claire 0ef1cf0590 Update dependency json 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
Claire f2e61fbd56 Fix error handling in ActivityPub::ProcessFeaturedItemService (#39787) 2026-07-16 14:47:44 +02:00
Claire ea05e85eee Fix relative times (#39742) 2026-07-16 14:47:44 +02:00
Claire a37afb7378 Merge pull request #3566 from glitch-soc/glitch-soc/merge-4.6 
Merge upstream changes up to eeb68053a8 into stable-4.6
 2026-07-03 19:51:47 +02:00
Claire f8fb62193a Merge commit 'eeb68053a83894190eefae178a661018b9859494' into glitch-soc/merge-4.6 2026-07-03 18:14:36 +02:00
Claire eeb68053a8 Bump version to v4.6.3 2026-07-03 15:22:15 +02:00
Claire c52e87dc68 Update dependency msgpack 2026-07-03 14:38:32 +02:00
Claire 03fe80c3a8 Update dependency crass 2026-07-03 14:38:32 +02:00
Claire f4cdbb9015 Add “Update available” navigation item at top of navbar when new Mastodon versions are available (#39705) 2026-07-03 14:38:32 +02:00
Claire 63431d1180 Merge pull request #3563 from glitch-soc/glitch-soc/merge-4.6 
Merge upstream changes up to 06d64519da into stable-4.6
 2026-07-02 21:31:35 +02:00
Claire 8941f1f98c Merge commit '06d64519da4c6fc50536744f0d950dae22c6e2b9' into glitch-soc/merge-4.6 2026-07-02 18:31:59 +02:00
Claire 94b897fdee Fix incorrect filter cache key sometimes causing incorrect filters to be applied (#39698) 2026-07-02 14:14:43 +02:00
Claire 1fd5fe741c Always use public/packs and not public/packs-test for assets (#39623) 2026-07-02 14:14:43 +02:00
Claire 7f2fd68a1e Merge pull request #3553 from glitch-soc/glitch-soc/merge-4.6 
Merge upstream changes up to 70d39d364b into stable-4.6
 2026-06-25 11:42:41 +02:00
Claire 42e1446900 Merge commit '70d39d364ba6183a2b6e2f763204fe2c21e0ca42' into glitch-soc/merge-4.6 2026-06-25 11:07:11 +02:00
Claire 70d39d364b Bump version to v4.6.2 2026-06-25 10:56:15 +02:00
Claire 311e648ffa Merge pull request #3549 from glitch-soc/glitch-soc/merge-4.6 
Merge upstream changes up to 46108ecfe1 in stable-4.6
 2026-06-24 17:54:54 +02:00
Claire 3083fdad1f Merge commit '46108ecfe18f53e8a989aa36e9397914f6bc0108' into glitch-soc/merge-4.6 2026-06-24 17:27:19 +02:00
Claire 46108ecfe1 Update changelog 2026-06-24 15:34:54 +02:00
Claire 8fe3dbad2e Bump version to v4.6.1 2026-06-24 14:48:52 +02:00
Claire eb5daf4a64 Merge pull request #3547 from glitch-soc/glitch-soc/merge-4.6 
Merge upstream changes up to b5e771b89e
 2026-06-23 21:20:09 +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
Claire a454bbde69 Bump Mastodon API version (#39574) 2026-06-23 17:35:29 +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 0c4bf90bae Merge pull request #3537 from glitch-soc/glitch-soc/merge-4.6 
Merge upstream changes up to 137d5801544ca5b8078ce2242ff3b5505e648166 into stable-4.6
 2026-06-17 15:30:35 +02:00
Claire ddfb2ea968 [Glitch] Fixes being unable to edit an attachment twice without submitting 
Port 3109a5a4d8612ba2d9468a2151cafbe738598099 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-06-17 14:44:24 +02:00
Claire 5dfb14f518 [Glitch] Fix styling of follow requests 
Port 69fdefb376da47ad38d04b69108729ab675d7b68 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-06-17 14:44:24 +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
Claire e864238991 Bump version to v4.6.0 (#39470) 2026-06-17 14:14:09 +02:00
Claire 291dda95da Fixes being unable to edit an attachment twice without submitting (#39453) 2026-06-17 12:09:12 +02:00
Claire 4cccaaa9ec Fix styling of follow requests (#39452) 2026-06-17 12:09:12 +02:00
Claire 1f927a8f77 Merge pull request #3535 from glitch-soc/glitch-soc/merge-4.6 
Merge upstream changes up to e2b7096bd3 into stable-4.6
 2026-06-16 22:14:57 +02:00
Claire 6aca68e185 Merge commit 'e2b7096bd3f93afcf4d6b3e7ffb9ccdb417a9def' into glitch-soc/merge-4.6 2026-06-16 21:49:17 +02:00
Claire e2b7096bd3 Bump version to v4.6.0-rc.2 (#39441) 2026-06-15 17:27:55 +02:00
Claire e2d44d8343 Update dependency net-imap (#39426) 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 a8644ccb3e Merge pull request #3529 from glitch-soc/glitch-soc/merge-upstream 
Merge upstream changes up to b902c82505
 2026-06-12 19:16:15 +02:00
Claire 08027edb10 Merge commit 'b902c825054b953599cd0341acf428332fca5044' into glitch-soc/merge-upstream 2026-06-12 18:37:02 +02:00