Skip to content

Conversation

@mserranom
Copy link

@mserranom mserranom commented Jun 6, 2025

main branch is now tracking multer v2.x in expressjs/multer. This PR rebases the latest main changes (up to v2.0.1) into the fork.

$ git -P log upstream/main..msm-rebase-upstream-2-0-1 
commit ace94510b4c1f8f60cdb45e8c5027c7c718a6dc7 (HEAD -> msm-rebase-upstream-2-0-1, origin/msm-rebase-upstream-2-0-1)
Author: Ersun Warncke <ersun.warncke@overleaf.com>
Date:   Fri Dec 7 05:18:59 2018 -0400

    allow file upload without filename

  • Run npm test

tsando and others added 30 commits April 17, 2018 19:35
Fix broken link in Chinese Readme
Fix mistake in word "файЛ"
Add unit for fieldSize in busboy limit params
Version 1.0.0 of testdata-w3c-json-form contains a correction to the
test data. Without the correction (of the bottle-on-wall type from an
array of numbers to an array of strings), it is possible that tests will
break in Node.js 13.0.0 or a future release.
Co-Authored-By: Jonathan Church <me@jonchurch.com>
bjohansebas and others added 19 commits May 16, 2025 17:43
…um node version, fix readme badges, add .npmrc

fix: handle two busboy error events

♻️ fully drain stream

🥅 explicitly handle req error

🚨 lint:fix

🔖 v2.0.0

⬆️ bump mocha

docs: include release 2.0.0 details

---------

Co-authored-by: mhassan1 <marc.j.hassan@gmail.com>
Co-authored-by: Ulises Gascón <ulisesgascongonzalez@gmail.com>
Co-authored-by: Ulises Gascón <ulisesgascongonzalez@gmail.com>
@mserranom mserranom changed the title Rebase express/main branch Rebase upstream main branch Jun 6, 2025
@mserranom mserranom requested a review from das7pad June 6, 2025 06:44
Copy link
Member

@das7pad das7pad left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Can you open a ticket to see if we can drop this extra patch and go back to upstream multer?

@das7pad das7pad assigned mserranom and unassigned das7pad Jun 6, 2025
@mserranom mserranom force-pushed the msm-rebase-upstream-2-0-1 branch from d911a55 to ace9451 Compare June 6, 2025 07:42
@mserranom mserranom merged commit 4dbceda into master Jun 6, 2025
2 of 32 checks passed
@mserranom mserranom deleted the msm-rebase-upstream-2-0-1 branch June 6, 2025 07:45
@mserranom mserranom mentioned this pull request Jul 21, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.