merge back Release/10.12.2 #40827
Closed
merge back Release/10.12.2 #40827
Conversation
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
…2bits_quota_release Maybe we can avoid a merge conflict then?
* Fix quota for 32 bits. Some vars could be float instead of integer * Include float type in phpdocs * force downgrading encryption to 1.5.3 in .drone.star, this branch is intended to be shipped with 1.5.3 --------- Co-authored-by: Juergen Weigert <[email protected]>
* Allow javascript .map files in .htaccess Fixes #40734 * fix syntax --------- Co-authored-by: Phil Davis <[email protected]>
…sWithSensitiveParameters Add loginInOwnCloud to Log::$methodsWithSensitiveParameters
…a resource which was shared with limited permissions
Member
|
Commit history looks fishy |
Contributor
The 10.12 branch has a long commit history all the way back to whenever 10.12.0 was branched from master. It is not really feasible to merge-back the whole thing to master - there will be conflicts and problems. I will make a PR that cherry-picks the needed things. |
Contributor
|
See PR #40828 |
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.
Merge back branch release/10.12.2
@phil-davis can you do the magic, to make this work?
Or should we leave the branch as is, and only cherry pick a few things?