Merge 10.12.2 to master

[phil-davis]

Description

The real code released in 10.12.2 has already been merged to master:
PR #40792 Add loginInOwnCloud to Log::$methodsWithSensitiveParameters
PR #40803 Do not allow to set higher permissions on a federated share
PR #40826 Update ca-bundle.crt

version.php has already been bumped to 10.13.0 in master anyway, so we don't bump it to 10.12.2.

I forgot to bump the version in sonar-project.properties in master a few weeks ago. So I have cherry-picked the commit that bumps it to 10.12.2 and then added a commit to bump it to 10.13.0 which matches the 10.13.0 in version.php

I have made a commit that moves the two changelog entries into 10.12.2_2023-05-31 - that matches what was done in commit 5ff29e98828fc506a2bdadc942ada77b45a80060 in the release/10.12.2 branch.

Related Issue

https://github.com/owncloud/enterprise/issues/5757

How Has This Been Tested?

CI

Types of changes

• Bug fix (non-breaking change which fixes an issue)
• New feature (non-breaking change which adds functionality)
• Database schema changes (next release will require increase of minor version instead of patch)
• Breaking change (fix or feature that would cause existing functionality to change)
• Technical debt
• Tests only (no source changes)

Checklist:

• Code changes
• Unit tests added
• Acceptance tests added
• Documentation ticket raised:
• Changelog item, see TEMPLATE

[phil-davis]

FYI the commit history of the release/10.12.2 branch back to the v10.12.1 tag is:

commit 01ece70d7519e6fbea5b11fd5183c84c795e6862 (HEAD -> release/10.12.2, tag: v10.12.2, origin/release/10.12.2)
Author: Juergen Weigert <[email protected]>
Date:   Tue Jun 6 16:22:03 2023 +0200

    manually commit https://github.com/owncloud/core/pull/40826 into the release branch

commit 5ff29e98828fc506a2bdadc942ada77b45a80060
Author: Juergen Weigert <[email protected]>
Date:   Tue Jun 6 16:09:31 2023 +0200

    bump version.php to final, move changelog/unreleased

commit d11aab15fe16f21706b99768fa6ba9d652574e59
Author: Juergen Weigert <[email protected]>
Date:   Tue Jun 6 16:04:19 2023 +0200

    bump version in sonar...

commit 19f5b955aa8d4b6928786f28cdd1b8bf0ad01ce0 (tag: v10.12.2-rc.1)
Author: Juergen Weigert <[email protected]>
Date:   Wed May 31 18:14:11 2023 +0200

    Bump version in version.php

commit 5c2fc08347234f80f303a2c25b8ff531b39b9f08
Author: Thomas Müller <[email protected]>
Date:   Mon May 22 21:27:50 2023 +0200

    fix: Do not allow to set higher permissions on a federated share for a resource which was shared with limited permissions

commit de9e8dab9474d6024032de03ab4c45c82c9b9740
Author: Phil Davis <[email protected]>
Date:   Wed May 17 10:49:25 2023 +0545

    Merge pull request #40792 from owncloud/add-loginInOwnCloud-to-methodsWithSensitiveParameters
    
    Add loginInOwnCloud to Log::$methodsWithSensitiveParameters

commit 97e3d82b92decc2d9307fad152cffa9bb5f31c44 (tag: v10.12.1, origin/10.12)
Author: Juergen Weigert <[email protected]>
Date:   Sat Apr 15 14:00:27 2023 +0200

    Bump version

[sonarqubecloud]

Kudos, SonarCloud Quality Gate passed!   

0 Bugs
0 Vulnerabilities
0 Security Hotspots
0 Code Smells

No Coverage information
No Duplication information

[DeepDiver1975]

Yes. Besides changes to the changelog nothing else should be in here. Well done. 👍