tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
29,497 Commits 5 Branches 0 Tags
311e648ffa058b49da9434e59d88d12ed3cb568e
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Claire b902c82505 Trim stable-4.3 from changelog and update SECURITY.md (#39395) 2026-06-12 09:33:03 +00:00
Claire 604b34faaf Merge pull request #3528 from glitch-soc/glitch-soc/merge-upstream 
Merge upstream changes up to 96e23af892
 2026-06-11 15:32:45 +02:00
Claire bbbbb24dbd Merge commit '96e23af89258068d05cc8557df914b4a9add385b' into glitch-soc/merge-upstream 2026-06-11 13:26:25 +02:00
Claire fd2e3d53eb Fix inconsistent check on post edition when there is both a poll and attachments (#39368) 2026-06-11 08:03:10 +00:00
Claire 42bdcc70d5 Merge pull request #3527 from glitch-soc/glitch-soc/merge-upstream 
Merge upstream changes up to 9e0a3aaf08
 2026-06-10 19:39:54 +02:00
Claire 89c2ac444f Merge commit '9e0a3aaf08e7d4fc700f7f19d61f5f8fee346b6a' into glitch-soc/merge-upstream 2026-06-10 18:52:58 +02:00
Claire 9e0a3aaf08 Resolve links to unknown remote objects when posting (#38711) 2026-06-10 15:55:27 +00:00
Claire 22a5e1b0b0 Fix Elasticsearch connection cleanup in Sidekiq middleware (#39359) 2026-06-10 15:12:25 +00:00
Claire e697d44144 Fix avatar and profile header descriptions not being serialized over ActivityPub (#39352) 2026-06-10 08:46:36 +00:00
Claire 21c95ddbe4 Merge pull request #3526 from glitch-soc/glitch-soc/merge-upstream 
Merge upstream issues up to b48f907b20
 2026-06-10 09:28:01 +02:00
Claire 8c50d2fb5e Fix linting issues 2026-06-09 21:53:09 +02:00
Claire b46babae1e [Glitch] Change media attachment limit to 10000 characters 
Port c4ea89dfd9 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-06-09 21:36:56 +02:00
Claire e08c8b6933 Merge commit 'b48f907b20e2c9909665a484041845697d26f17c' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/settings_helper.rb`:
  Upstream added a new helper.
  Conflict caused by the fact there is a glitch-soc specific helper.
  Added upstream's new helper in addition to glitch-soc's.
 2026-06-09 21:30:54 +02:00
Claire 4ee893461d Change i18n unused strings check to only check English strings (#39347) 2026-06-09 14:17:36 +00:00
Claire 422d0e4e20 Add duration to ActivityPub representation of media attachments (#38061) 2026-06-09 08:30:53 +00:00
Claire 0b0cdd7a77 Remove doorkeeper workaround (#39336) 2026-06-09 08:30:48 +00:00
Claire 481e51b81e Put Elasticsearch search queries behind a Stoplight (#39323) 2026-06-09 08:30:43 +00:00
Claire c4ea89dfd9 Change media attachment limit to 10000 characters (#39306) 2026-06-08 14:03:56 +00:00
Claire 60608f54e2 Merge pull request #3525 from glitch-soc/glitch-soc/merge-upstream 
Merge upstream changes up to ead13d4826
 2026-06-08 08:26:35 +02:00
Claire 1b5b83114a Fix test that was broken because of different glitch-soc default settings 2026-06-07 15:17:40 +02:00
Claire 5c4c27fcd0 [Glitch] Add link to profile editing from “Privacy and reach” 
Port 2778eeffba to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-06-07 14:46:02 +02:00
Claire c2e6cbb12b Merge commit 'ead13d4826a7ba1699d6bb310e58642b15687671' into glitch-soc/merge-upstream 2026-06-07 14:29:57 +02:00
Claire 2778eeffba Add link to profile editing from “Privacy and reach” (#39309) 2026-06-05 14:24:42 +00:00
Claire 24609bf041 Change rule acceptance link to form (#39283) 2026-06-05 12:45:28 +00:00
Claire 62bcdc41fc Allow authorized_interactions endpoint to handle Collections (#39287) 2026-06-05 07:54:55 +00:00
Claire a19dd606e8 Fix link to profile API documentation in CHANGELOG (#39276) 2026-06-04 13:10:06 +00:00
Claire 1c9b6625e2 Merge pull request #3524 from glitch-soc/glitch-soc/merge-upstream 
Merge upstream changes up to 52aa8a44bb
 2026-06-03 23:05:36 +02:00
Claire a1ab96baed Merge commit '52aa8a44bbd0c9a6673cbd9b7c088020be938799' into glitch-soc/merge-upstream 2026-06-03 22:30:16 +02:00
Claire bbab7cf213 Merge pull request #3523 from glitch-soc/glitch-soc/merge-upstream 
Merge upstream changes up to 0529a1f7d2
 2026-06-03 15:06:02 +02:00
Claire 003ad015f8 Merge commit '0529a1f7d2197dd535f59163c00634f9c060723d' into glitch-soc/merge-upstream 2026-06-03 14:42:51 +02:00
Claire 0529a1f7d2 Bump version to v4.5.11 (#39264) 2026-06-03 12:26:55 +00:00
Claire 8e8c7bcfe6 Merge pull request #3520 from glitch-soc/glitch-soc/merge-upstream 
Merge upstream changes up to 07236016bc
 2026-06-03 12:38:20 +02:00
Claire 659a077616 Merge commit '07236016bcc78a82205093b3e067bf4a1bb07d88' into glitch-soc/merge-upstream 2026-06-03 12:19:05 +02:00
Claire c2daca655f Merge commit from fork 2026-06-03 11:57:50 +02:00
Claire 73dc3ea7bf Merge pull request #3519 from glitch-soc/glitch-soc/merge-upstream 
Merge upstream changes up to d1c26c1e27
 2026-06-02 18:51:11 +02:00
Claire dd12ed2b98 Merge commit 'd1c26c1e27348278fb8081b290e300b327a61ca1' into glitch-soc/merge-upstream 2026-06-02 18:01:45 +02:00
Claire d1c26c1e27 Fix not importing stylesheet recursively (#39254) 2026-06-02 15:23:52 +00:00
Claire cd43ca4d95 Merge pull request #3518 from glitch-soc/glitch-soc/merge-upstream 
Merge upstream changes up to facb552c9c
 2026-06-02 09:32:44 +02:00
Claire 524d3a0d7f [Glitch] Fix server rules and custom closed registrations message 
Port ab8f9d94ea to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-06-01 18:01:23 +02:00
Claire 3cf0fb7ba0 Merge commit 'facb552c9cdbe8a2ebff0b94ebf2c9e9ec385347' into glitch-soc/merge-upstream 2026-06-01 18:00:03 +02:00
Claire 89d9fc8889 Remove ignored_columns for columns removed in pre-4.2.0 migrations (#39237) 2026-06-01 14:40:03 +00:00
Claire 1bd13af546 Fix error handling for invalid keys in signature verification (#39235) 2026-06-01 13:20:23 +00:00
Claire ab8f9d94ea Fix server rules and custom closed registrations message (#39232) 2026-06-01 09:28:13 +00:00
Claire 7f2f403a84 Merge pull request #3517 from glitch-soc/glitch-soc/merge-upstream 
Merge upstream changes up to 0caf334891
 2026-05-30 22:39:50 +02:00
Claire ae2ff31f32 Merge commit '0caf334891e0a5f4e995f1d667eb83d3aad7e41e' into glitch-soc/merge-upstream 
Conflicts:
- `lib/mastodon/version.rb`:
  Upstream updated the API version, while we also have a custom glitch API version.
  Updated as upstream did.
 2026-05-30 12:13:35 +02:00
Claire 28411fe366 Merge pull request #3513 from glitch-soc/glitch-soc/merge-upstream 
Merge upstream changes up to 9215e1ec53
 2026-05-28 08:40:19 +02:00
Claire 83e77e88ae Merge commit '9215e1ec53dcf3714080c84af7af070bcb8d9978' into glitch-soc/merge-upstream 2026-05-27 20:04:47 +02:00
Claire 0cf7ce70e3 Merge pull request #3512 from glitch-soc/glitch-soc/merge-upstream 
Merge upstream changes up to d20d049226
 2026-05-27 20:04:26 +02:00
Claire 06176deee2 Merge commit 'd20d04922672ed016029c40ed64798f341ebca91' into glitch-soc/merge-upstream 2026-05-26 20:48:49 +02:00
Claire 235637fc5f Merge pull request #3511 from glitch-soc/glitch-soc/merge-upstream 
Merge upstream changes up to 6a4d14b178
 2026-05-25 17:31:18 +02:00
Claire 487c814eb9 Merge commit '6a4d14b178fc00de989b4a2758f2a1e4adf5ed33' into glitch-soc/merge-upstream 
Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
  Glitch-soc allows a wider range of HTML than upstream.
  Upstream added `:all => %w(lang)`, which was not supported by glitch-soc,
  added it there too.
 2026-05-22 19:43:42 +02:00
Claire cdf721a273 Fix remote statuses with large media descriptions being rejected (#39135) 2026-05-21 15:46:10 +00:00
Claire 6c1cba5e80 Merge pull request #3509 from glitch-soc/glitch-soc/merge-upstream 
Merge upstream changes up to f5b57e8ba7
 2026-05-20 16:07:24 +02:00
Claire ca427bc176 Merge commit 'f5b57e8ba7a2d3687b1ae496f6213bfe5347c0fa' into glitch-soc/merge-upstream 2026-05-20 15:43:33 +02:00
Claire f5b57e8ba7 Bump version to v4.5.10 (#39104) 2026-05-20 13:20:08 +00:00
Claire 0786c1e57a Merge commit from fork 2026-05-20 14:38:24 +02:00
Claire ec2a99341c Merge commit from fork 
* Refactor `PrivateAddressCheck`

Also ensures IPv4-mapped IPv6 addresses get properly checked no matter the version of `ipaddr`.

* Add some missing IPv6 ranges from `PrivateAddressCheck`
 2026-05-20 14:34:32 +02:00
Claire a17ef5599d Merge pull request #3505 from glitch-soc/glitch-soc/merge-upstream 
Merge upstream changes up to 6f8558a6b9
 2026-05-20 12:03:30 +02:00
Claire da3cfecb8d [Glitch] Fix custom emoji selection 
Port f28715d370 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-05-20 11:32:28 +02:00
Claire aaf06a8186 Merge commit '6f8558a6b96041541d911439421563c1e9e7b3f4' into glitch-soc/merge-upstream 2026-05-20 11:31:39 +02:00
Claire 6f8558a6b9 Fix Request error when issuing a request which host is an IP address (#39030) 2026-05-20 09:04:50 +00:00
Claire f28715d370 Fix custom emoji selection (#39088) 2026-05-20 07:23:29 +00:00
Claire 0c80bf0e82 Merge commit 'fcf012c6026418b6c76bff173eec944e0c25913f' into glitch-soc/merge-upstream 
Conflicts:
- `vite.config.mts`:
  Upstream changed a line adjacent to one glitch-soc modified due to its theming system.
  Adapted upstream's change.
- `yarn.lock`:
  Upstream updated a dependency next to one glitch-soc added.
  Updated the dependency as upstream did.
 2026-05-19 20:40:57 +02:00
Claire fcf012c602 Update browserslists target (#39076) 2026-05-19 16:21:18 +00:00
Claire dc642da3b7 Merge pull request #3504 from glitch-soc/glitch-soc/merge-upstream 
Merge upstream changes up to c26003af21
 2026-05-19 08:09:38 +02:00
Claireanddiondiondion 108f8c9881 [Glitch] Nudge users to turn on discoverable when viewing the empty list of collections they are in 
Port 99b72f60ad to glitch-soc

Co-authored-by: diondiondion <mail@diondiondion.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2026-05-18 19:36:52 +02:00
Claire 42ec9a607b Merge commit 'c26003af215da7696e2b0dcece7fa695b1be8871' into glitch-soc/merge-upstream 2026-05-18 19:35:08 +02:00
Claireanddiondiondion 99b72f60ad Nudge users to turn on discoverable when viewing the empty list of collections they are in (#39029) 
Co-authored-by: diondiondion <mail@diondiondion.com>
 2026-05-18 12:11:14 +00:00
Claire 28b98143d5 Merge pull request #3502 from glitch-soc/glitch-soc/merge-upstream 
Merge upstream changes up to 8bbde181db
 2026-05-13 21:36:43 +02:00
Claire 808b7a858d Merge commit '8bbde181db0d6d79018fb1754a8296e753d47415' into glitch-soc/merge-upstream 2026-05-13 18:42:04 +02:00
Claire 28f11ca535 Merge pull request #3501 from glitch-soc/glitch-soc/merge-upstream 
Merge upstream changes up to d2f640272f
 2026-05-13 18:39:55 +02:00
Claire 4fcc9b8a40 Merge commit 'd2f640272f3f36c8979cff645416682840528906' into glitch-soc/merge-upstream 2026-05-12 18:37:31 +02:00
Claire c25abe85c5 Merge pull request #3499 from glitch-soc/glitch-soc/merge-upstream 
Merge upstream changes up to dcc26c1b24
 2026-05-08 21:53:50 +02:00
Claire 8785d3f6fe Merge commit 'dcc26c1b2484848d5b7c3c1a56cfe38b37e83d23' into glitch-soc/merge-upstream 2026-05-08 20:22:32 +02:00
Claire ccb7bd118f Merge pull request #3498 from glitch-soc/glitch-soc/merge-upstream 
Merge upstream changes up to b2aa476abb
 2026-05-07 20:14:07 +02:00
Claire 99f0a03dec Merge commit 'b2aa476abbe82e2b49d84c9fb8ef654f95391fd3' into glitch-soc/merge-upstream 2026-05-07 18:26:17 +02:00
Claire b2aa476abb Redirect with interstitial when trying to view a remote collection while logged out (#38941) 2026-05-07 16:04:26 +00:00
Claire fcd56d6732 Fix type of interactingObject, interactionTarget and add missing QuoteAuthorization (#38940) 2026-05-07 14:47:19 +00:00