Sync 4.x with master #5529
Closed
Sync 4.x with master #5529
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Co-authored-by: Chris de Almeida <[email protected]>
Co-authored-by: Chris de Almeida <[email protected]>
Co-authored-by: Chris de Almeida <[email protected]>
* docs: add Threat Model * docs: update reference Co-authored-by: Chris de Almeida <[email protected]> * docs: improve readability Co-authored-by: Chris de Almeida <[email protected]> * docs: add reference to the Threat Model --------- Co-authored-by: Chris de Almeida <[email protected]>
PR-URL: #5433 --------- Co-authored-by: Íñigo Marquínez Prado <[email protected]>
Co-authored-by: Mert Can Altin <[email protected]>
* doc: updated readme file * doc: updated readme file for doc lint * Update Readme.md Co-authored-by: krzysdz <[email protected]> * Update Readme.md Co-authored-by: Ulises Gascón <[email protected]> * Update Readme.md Co-authored-by: Ulises Gascón <[email protected]> * Update Readme.md Co-authored-by: Christine Belzie <[email protected]> * repair readme * added Emeritus area * Add @carpasse to the triager team * removed old collaborators * add missing triagers * lint * Update Readme.md Co-authored-by: Jon Church <[email protected]> * Update Readme.md Co-authored-by: Jon Church <[email protected]> * dedent to fix ToC spacing * fixup! dedent to fix ToC spacing * us @ for jonchurch * format names to use github handles first, single line * added emeritus triagers * edited title * added emeritus team members * added menu head * edited emeritus * Update Readme.md Co-authored-by: Jon Church <[email protected]> * Update Readme.md Co-authored-by: Jon Church <[email protected]> * edits to TC and anchors * Update Readme.md Co-authored-by: Jon Church <[email protected]> * Update Readme.md Co-authored-by: Jon Church <[email protected]> * Update Readme.md Co-authored-by: Jon Church <[email protected]> * Update Readme.md Co-authored-by: Jon Church <[email protected]> * Update Readme.md Co-authored-by: Jon Church <[email protected]> * Update Readme.md Co-authored-by: Ulises Gascón <[email protected]> * Update Readme.md Co-authored-by: Ulises Gascón <[email protected]> * Update Readme.md Co-authored-by: Ulises Gascón <[email protected]> * Update Readme.md Co-authored-by: Ulises Gascón <[email protected]> * Update Readme.md Co-authored-by: Ulises Gascón <[email protected]> --------- Co-authored-by: Mert Can Altin <[email protected]> Co-authored-by: krzysdz <[email protected]> Co-authored-by: Ulises Gascón <[email protected]> Co-authored-by: Christine Belzie <[email protected]> Co-authored-by: Jon Church <[email protected]>
Co-authored-by: Ulises Gascón <[email protected]>
…ons.expires` (#5672) * add deprecation notice for res.clearCookie maxAge/expires * update History.md for clearCookie deprecation change * add tests to codify deprecated behavior Co-authored-by: Chris de Almeida <[email protected]> --------- Co-authored-by: Chris de Almeida <[email protected]>
* skip QUERY tests for Node 21 only, still not supported QUERY support has now landed in Node 22.2.0, but is still not supported in 21.7.3 QUERY showed up in http.METHODS in 21.7.2. Only Node versions after that will attempt to run tests for it, based on the way we dynamically test members of the http.METHODS array from Node * update CI to run on 21.7 and 22.2
|
I think we should just drop this update and delete the 4.x branch until we cut over to v5. Since master is v4 I think it doesn't matter to keep this updated. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Edit: actually this should just be a FF merge, or this PR should be completed with a rebase if we have that enabled in github
It looks like the 4.x branch was last updated with 4.17.2
Merging master in while it's at 4.18.3 syncs it back to where it should be
(should be according to the current release guide and the proposed updated one)