Release KIC 2.4 to main #4031
Merged
Release KIC 2.4 to main #4031
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
rainest
added
the
review:general
✅ Deploy Preview for kongdocs ready!
To edit notification comments on pull requests, go to your Netlify site settings. |
|
I'll look into the conflict. |
* Copy 2.3.x directory for upcoming 2.4.x release * Documenting --term-delay parameter This was introduced in Kong/kubernetes-ingress-controller#2494 and should be released as part of v2.4.0 * Make 2.4.x latest version * remove duplicate directory for 2.4.x; move 2.3.x to /src/; create 2.3.x and 2.4.x navigation files * set 2.4.x filter on term-delay * backticks for cli flags so they render accurately; capitalization/punctuation * Fix if_version space rendering Co-authored-by: lena.larionova <[email protected]> Co-authored-by: Michael Heap <[email protected]> Co-authored-by: lena-larionova <[email protected]>
Co-authored-by: lena-larionova <[email protected]>
lena-larionova
force-pushed
the
release/kic-2.4
branch
from
f94fb6d to
d65e69c
Compare
|
FYI, I'm fixing the issues caught by our spell-checker as well. |
…s many versions ago
lena-larionova
approved these changes
Jun 16, 2022
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.
Summary
Migrating #4029 and prior in the branch to main. Same reason/testing from #4029.
https://github.com/Kong/docs.konghq.com/blame/main/app/_plugins/blocks/kong_version_block.rb#L43 in main conflicts with https://github.com/Kong/docs.konghq.com/blame/release/kic-2.4/app/_plugins/blocks/kong_version_block.rb#L47-L56 and I do not know enough about the use of that template to say how it should be merged.
Not sure on the others, I'm not getting those after
git checkout release/kic-2.4; git pull; git fetch; git merge origin/main.