Merge 2.6.0 release back into trunk#808
Merged
Merged
Conversation
Co-authored-by: Felix Arntz <felixarntz@users.noreply.github.com>
…n translation strings
Co-authored-by: Felix Arntz <felixarntz@users.noreply.github.com>
Co-authored-by: Mukesh Panchal <mukeshpanchal27@users.noreply.github.com>
Add output buffering checkbox to Server-Timing screen
Prepare 2.6.0 release
felixarntz
added
[Type] Documentation
felixarntz
requested review from
JustinyAhin,
adamsilverstein,
mitogh,
pbearne and
spacedmonkey
as code owners
joemcgill
approved these changes
Aug 21, 2023
Member
joemcgill
left a comment
joemcgill
left a comment
There was a problem hiding this comment.
Looks right to me, though it would generally be better to have had the code from #801 already in trunk rather than committing directly to a release branch, to avoid potential conflicts had new PRs needed to be based on this work.
mukeshpanchal27
approved these changes
Aug 21, 2023
Member
Author
|
Thanks @joemcgill! The reason that this was only in the release branch is that we cut the release branch shortly before that PR was finalized. In principle I agree with you though, I think the general idea is to avoid this where possible. |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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
Fixes #804
Checklist
[Focus]orInfrastructurelabel.[Type]label.no milestonelabel.