-
Notifications
You must be signed in to change notification settings - Fork 3
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
Add k8s with fixed conflicts #201
Open
kristofferlarberg
wants to merge
29
commits into
main
Choose a base branch
from
fix/k8s-conflicts
base: main
Could not load branches
Branch not found: {{ refName }}
Could not load tags
Nothing to show
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
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
…instead of dynamic to let the static generator do it's magic
The latest updates on your projects. Learn more about Vercel for Git ↗︎
|
irony
previously approved these changes
Dec 23, 2022
@@ -12,6 +12,8 @@ export const previewClient = createClient({ | |||
token: process.env.SANITY_API_TOKEN, | |||
}) | |||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Borde tas bort
kristofferlarberg
force-pushed
the
fix/k8s-conflicts
branch
from
January 13, 2023 10:32
0433e59
to
a8badf5
Compare
kristofferlarberg
dismissed
irony’s stale review
February 1, 2023 11:07
The base branch was changed.
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.
Description
This pr fixes conflicts with
main
andfeat/k8s
#153Status
Awaiting checks that the Kubernetes setup is working correctly(?) before possible to merge. This pr should be merged and #153 should be removed.