Skip to content

merge back Release/10.12.2 - #40827

Closed
jnweiger wants to merge 20 commits into
masterfrom
release/10.12.2
Closed

jnweiger wants to merge 20 commits into
masterfrom
release/10.12.2

Conversation

@jnweiger

@jnweiger jnweiger commented Jun 6, 2023

Copy link
Copy Markdown
Contributor

Merge back branch release/10.12.2

  • several PRs were duplicated into both, master and this branch, so we most likely have some conflicts.
  • This branch was created ontop of the v10.12.1 tag, with hand-selected commits from @DeepDiver1975

@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?

jnweiger and others added 20 commits April 3, 2023 16:53
…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 <jnweiger@gmail.com>
* Allow javascript .map files in .htaccess
Fixes #40734

* fix syntax

---------

Co-authored-by: Phil Davis <phil@jankaritech.com>
…sWithSensitiveParameters

Add loginInOwnCloud to Log::$methodsWithSensitiveParameters
…a resource which was shared with limited permissions
@DeepDiver1975

Copy link
Copy Markdown
Contributor

Commit history looks fishy

@phil-davis

Copy link
Copy Markdown
Contributor

Or should we leave the branch as is, and only cherry pick a few things?

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.

@phil-davis

Copy link
Copy Markdown
Contributor

See PR #40828

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants