Skip to content

Conversation

@sam-github
Copy link
Contributor

Backport of #24679

Preemptive, the sorting doesn't cherrypick well down to release branches, this should help prevent annoying conflicts in the docs.

Checklist
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
  • tests and/or benchmarks are included
  • documentation is changed or added
  • commit message follows commit guidelines

@nodejs-github-bot
Copy link
Collaborator

@sam-github sadly an error occured when I tried to trigger a build :(

@nodejs-github-bot nodejs-github-bot added doc Issues and PRs related to the documentations. v11.x labels Nov 27, 2018
@vsemozhetbyt
Copy link
Contributor

Does this need rebasing?

@sam-github sam-github force-pushed the backport-24679-to-v11.x branch from 07f1f64 to 69c41f1 Compare November 28, 2018 17:13
@sam-github
Copy link
Contributor Author

rebased

Copy link
Contributor

@vsemozhetbyt vsemozhetbyt left a comment

Choose a reason for hiding this comment

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

With a nit.

@vsemozhetbyt
Copy link
Contributor

Node.js Collaborators, please, add 👍 here if you approve fast-tracking.

@sam-github
Copy link
Contributor Author

@targos
Copy link
Member

targos commented Nov 29, 2018

@sam-github sam-github force-pushed the backport-24679-to-v11.x branch from 09f5222 to b3a9ade Compare November 30, 2018 22:30
@sam-github
Copy link
Contributor Author

Backport-PR-URL: nodejs#24680
PR-URL: nodejs#24679
Reviewed-By: Vse Mozhet Byt <vsemozhetbyt@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
@sam-github sam-github force-pushed the backport-24679-to-v11.x branch from b3a9ade to 476272a Compare December 3, 2018 17:38
@sam-github
Copy link
Contributor Author

I force pushed with amended description, no other changes. Mostly to get Travis to re-build it.

@sam-github
Copy link
Contributor Author

@BridgeAR @targos you may want to land this on v11.x-staging soon to help prevent conflicts from PRs touching docs after 64cea5a on master.

@BridgeAR
Copy link
Member

BridgeAR commented Dec 3, 2018

@sam-github thanks. I am going to prepare a new release tomorrow.

@sam-github
Copy link
Contributor Author

travis can never find the head commit, AFAICT, it always fails.

ci-lite: https://ci.nodejs.org/job/node-test-pull-request-lite-pipeline/1816/

@BridgeAR
Copy link
Member

BridgeAR commented Dec 5, 2018

Landed in 66d8330

@BridgeAR BridgeAR closed this Dec 5, 2018
BridgeAR pushed a commit that referenced this pull request Dec 5, 2018
Backport-PR-URL: #24680
PR-URL: #24679
Reviewed-By: Vse Mozhet Byt <vsemozhetbyt@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

doc Issues and PRs related to the documentations.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants