merge queue: embarking main (041dd4a) and #6138 together #6168
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
![mergify[bot]](https://avatars.githubusercontent.com/in/10562?s=60&v=4){kind=small}
No need to have two frameworks. Change-Id: I2841bff3a6b271fc3796eb63b8430da1e036bdc6
We have to enable the shiki highlighting mode and set a theme. Fixes MRGFY-4834 Change-Id: I49affe940645f81f941f03e116d02c4896ff031e
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.
🎉 This pull request has been checked successfully and will be merged soon. 🎉
Branch main (041dd4a) and #6138 are embarked together for merge.
This pull request has been created by Mergify to speculatively check the mergeability of #6138.
You don't need to do anything. Mergify will close this pull request automatically when it is complete.
Required conditions of queue
defaultfor merge:schedule=Mon-Fri 09:00-17:30[Europe/Paris]-title ~= ^featlabel = need changeloglabel = skip changelogtitle ~= ^(fix|feat|docs|style|refactor|perf|test|build|ci|chore|revert)(?:\(.+\))?:#approved-reviews-by >= 2author = dependabot[bot]author = mergify-ci-bot#changes-requested-reviews-by = 0#review-requested = 0#review-threads-unresolved = 0check-success = lintcheck-success = testcheck-success = test-broken-linkslabel = ignore-broken-linkscheck-success=Cloudflare Pages-head-repo-full-name~=^Mergifyio/check-neutral = Mergify Merge Protectionscheck-skipped = Mergify Merge Protectionscheck-success = Mergify Merge ProtectionsRequired conditions to stay in the queue:
check-success = lintcheck-success = testcheck-success = test-broken-linkslabel = ignore-broken-linkscheck-success=Cloudflare Pages-head-repo-full-name~=^Mergifyio/-title ~= ^featlabel = need changeloglabel = skip changelogtitle ~= ^(fix|feat|docs|style|refactor|perf|test|build|ci|chore|revert)(?:\(.+\))?:#approved-reviews-by >= 2author = dependabot[bot]author = mergify-ci-bot#changes-requested-reviews-by = 0#review-requested = 0#review-threads-unresolved = 0check-success = lintcheck-success = testcheck-success = test-broken-linkslabel = ignore-broken-linkscheck-success=Cloudflare Pages-head-repo-full-name~=^Mergifyio/check-success = Mergify Merge Protectionscheck-neutral = Mergify Merge Protectionscheck-skipped = Mergify Merge Protections