Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

docs: update master docs (bp #8353) #8672

Merged
merged 2 commits into from
Feb 24, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 23, 2021

This is an automatic backport of pull request #8353 done by Mergify.

Cherry-pick of 4c70268 has failed:

On branch mergify/bp/release/v0.41.x/pr-8353
Your branch is up to date with 'origin/release/v0.41.x'.

You are currently cherry-picking commit 4c70268c9.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   docs/.vuepress/config.js
	modified:   docs/core/cli.md

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   docs/package-lock.json

To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

* bump docs theme to 1.0.180

* add v0.40 to config.js versions

* Fix code snippet link

* reorganize order of versions
* 0.39, 0.41, master
* defaulting to 0.41

Co-authored-by: billy rennekamp <billy.rennekamp@gmail.com>
Co-authored-by: Amaury Martiny <amaury.martiny@protonmail.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
(cherry picked from commit 4c70268)

# Conflicts:
#	docs/package-lock.json
@tac0turtle
Copy link
Member

@lovincyrus does this need to be backported?

@lovincyrus
Copy link
Contributor

@lovincyrus does this need to be backported?

Yes please. Ref: #8353 (review)

@tac0turtle
Copy link
Member

@lovincyrus does this need to be backported?

Yes please. Ref: #8353 (review)

Could you solve the merge conflict then we will be able to merge this.

@lovincyrus
Copy link
Contributor

Could you solve the merge conflict then we will be able to merge this.

There are no merge conflicts that I can see.

docs/package-lock.json Outdated Show resolved Hide resolved
@amaury1093
Copy link
Contributor

Yes please. Ref: #8353 (review)

Ah, Cory's mergify tweak to backport to launchpad has been merged after this PR, so mergify didn't automatically backport.

@lovincyrus would you mind creating a similar backport PR for launchpad? 🙏

@tac0turtle
Copy link
Member

@alessio or @clevinson can we get a merge here

@alessio alessio merged commit 819af54 into release/v0.41.x Feb 24, 2021
@alessio alessio deleted the mergify/bp/release/v0.41.x/pr-8353 branch February 24, 2021 17:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants