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: upgrade vuepress to v2 (backport #1958) #1959

Merged
merged 2 commits into from
Jun 22, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 22, 2023

This is an automatic backport of pull request #1958 done by Mergify.
Cherry-pick of ea32d99 has failed:

On branch mergify/bp/release/v5.1.x/pr-1958
Your branch is up to date with 'origin/release/v5.1.x'.

You are currently cherry-picking commit ea32d997.
  (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/.gitignore
	renamed:    docs/.vuepress/config.js -> docs/.vuepress/config.ts
	new file:   docs/.vuepress/styles/index.scss
	deleted:    docs/.vuepress/styles/index.styl
	new file:   docs/.vuepress/styles/palette.scss
	deleted:    docs/.vuepress/styles/palette.styl
	modified:   docs/scripts/pre.sh

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

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/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.com

(cherry picked from commit ea32d99)

# Conflicts:
#	docs/package.json
#	docs/yarn.lock
@mergify mergify bot requested a review from a team June 22, 2023 00:36
@mergify mergify bot added the conflicts Pull requests that have conflicts with the base branch label Jun 22, 2023
@ryanchristo ryanchristo merged commit dd5448a into release/v5.1.x Jun 22, 2023
@ryanchristo ryanchristo deleted the mergify/bp/release/v5.1.x/pr-1958 branch June 22, 2023 01:18
@ryanchristo ryanchristo removed the conflicts Pull requests that have conflicts with the base branch label Jun 22, 2023
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.

2 participants