Fix merge conflicts #428
Merged
Fix merge conflicts #428
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
Prepare for a new release
Release v2.1.1
Release v2.1.2
* chore(deps): update pre-commit hook norwoodj/helm-docs to v1.14.2 (#413) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix: remove unsupported lifecycle field from default initContainer (#412) * Fix nginx port mapping (#345) * Use other port name when enabling nginx * Revert "Use other port name when enabling nginx" This reverts commit 908f4a9. * Change target port when enabling nginx * Use oneliner * fix(deps): update dependency mkdocs-material to v9.5.28 (#401) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update docker.io/nginx/nginx-prometheus-exporter docker tag to v1.2.0 (#405) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update pre-commit hook streetsidesoftware/cspell-cli to v8.10.1 (#408) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update docker.io/nginxinc/nginx-unprivileged docker tag to v1.27 (#407) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update ghcr.io/nautobot/nautobot docker tag to v2.2.7 (#410) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update appany/helm-oci-chart-releaser action to v0.4.2 (#403) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Release 2.1.3 preparation (#414) * chore(docs): update release notes * chore: update dependencies and chart annotations --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Danial Ebling <[email protected]> Co-authored-by: 2tefan <[email protected]>
gertzakis
approved these changes
Aug 23, 2024
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.
No description provided.