-
Notifications
You must be signed in to change notification settings - Fork 528
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
fix: bring back content-type header #4123
Merged
joe-elliott
merged 3 commits into
grafana:main
from
javiermolinar:bring-back-content-type-header
Sep 27, 2024
Merged
fix: bring back content-type header #4123
joe-elliott
merged 3 commits into
grafana:main
from
javiermolinar:bring-back-content-type-header
Sep 27, 2024
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
javiermolinar
requested review from
joe-elliott,
annanay25,
mdisibio,
mapno,
yvrhdn,
zalegrala,
electron0zero,
ie-pham and
stoewer
as code owners
September 26, 2024 10:18
joe-elliott
reviewed
Sep 26, 2024
joe-elliott
approved these changes
Sep 27, 2024
The backport to
To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-4123-to-release-v2.6 origin/release-v2.6
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 6afedd95e5b94d7f4dcac0175116d305ce4c619e When the conflicts are resolved, stage and commit the changes:
If you have the GitHub CLI installed: # Push the branch to GitHub:
git push --set-upstream origin backport-4123-to-release-v2.6
# Create the PR body template
PR_BODY=$(gh pr view 4123 --json body --template 'Backport 6afedd95e5b94d7f4dcac0175116d305ce4c619e from #4123{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title '[release-v2.6] fix: bring back content-type header' --body-file - --label 'type/bug' --label 'backport' --base release-v2.6 --milestone release-v2.6 --web Or, if you don't have the GitHub CLI installed (we recommend you install it!): # Push the branch to GitHub:
git push --set-upstream origin backport-4123-to-release-v2.6
# Create a pull request where the `base` branch is `release-v2.6` and the `compare`/`head` branch is `backport-4123-to-release-v2.6`.
# Remove the local backport branch
git switch main
git branch -D backport-4123-to-release-v2.6 |
joe-elliott
pushed a commit
that referenced
this pull request
Oct 15, 2024
* fix: bring back content-type header * init combiner in the proper place (cherry picked from commit 6afedd9)
2 tasks
joe-elliott
added a commit
that referenced
this pull request
Oct 15, 2024
* fix: bring back content-type header * init combiner in the proper place (cherry picked from commit 6afedd9) Co-authored-by: Javier Molina Reyes <[email protected]>
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.
What this PR does:
This pr brings back the
application-json
content-type header.Previously the common combiner harcoded the header to application json. Now we need to initialize the combiner with default values
Which issue(s) this PR fixes:
Fixes #4121
Checklist
CHANGELOG.md
updated - the order of entries should be[CHANGE]
,[FEATURE]
,[ENHANCEMENT]
,[BUGFIX]