Conversation
cee155e to
f3d6794
Compare
|
@mserranom does this seem like the right approach, I don't think it's quite what you did. |
That's right, they moved v2 development to
Looks like you didn't rebase the same way? The changes upstream are correct, but in reverse order:
|
|
The way I did it was I checked out master and then rebased our changes onto upstream/main. I'll have another go at it later and see if I can get it to work a different way. |
|
We're in need of the multer 2.0.2 upgrade for the next server pro release... anything I can do to help on this? |
|
@briangough I was planning to work on this tomorrow during the backlog day. Does it need to be released before tomorrow/Monday? The main task is setting up a way to test collabratec. |
|
I think that should be fine, thanks. |
|
Not needed since we merged the patched version of this in the main repo |


Version 2.0.2 fixes a sev:high issue.
This PR brings over the commits from version 2.0.2 of multer. The v2 branch seemed to be quite far behind so I'm just doing this straight into master.
I fixed some lint issues - they didn't seem like they'd be new and I don't know whether I should do them.
I'll test this commit hash on dev before merging.