Skip to content
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

Merge-back Release 10.15.0 #41300

Closed
wants to merge 18 commits into from
Closed

Merge-back Release 10.15.0 #41300

wants to merge 18 commits into from

Conversation

phil-davis
Copy link
Contributor

Description

Merge back the changes for 10.15.0 to the master branch.

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

jnweiger and others added 18 commits June 18, 2024 13:51
fix: AllConfig::getUserKeys to return string[] only
* fix: Update StoragesBackendService.php to default handling

also needed for #41271

* fix: Update StoragesBackendServiceTest to pass

---------

Co-authored-by: Phil Davis <[email protected]>
[10.15.0] fix: Update StoragesBackendService.php to default handling (#41273)
* docs: Document the system config variable telemetry.enabled in config.sample.php

* docs: small text fixes

* docs: trailing whitespace is flagged as bad style.

---------

Co-authored-by: mmattel <[email protected]>
(cherry picked from commit 841804c)
…#41276)

* chore(deps): bump phpseclib/phpseclib from 3.0.38 to 3.0.39

Bumps [phpseclib/phpseclib](https://github.com/phpseclib/phpseclib) from 3.0.38 to 3.0.39.
- [Release notes](https://github.com/phpseclib/phpseclib/releases)
- [Changelog](https://github.com/phpseclib/phpseclib/blob/master/CHANGELOG.md)
- [Commits](phpseclib/phpseclib@3.0.38...3.0.39)

---
updated-dependencies:
- dependency-name: phpseclib/phpseclib
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

* chore(deps): changelog for phpseclib 3.0.39

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
[10.15] test: update image preview fixture
@phil-davis phil-davis requested a review from jnweiger July 30, 2024 07:07
@phil-davis
Copy link
Contributor Author

@jnweiger the diffs here look good to me.
Please approve and merge whenever you are ready.

@phil-davis
Copy link
Contributor Author

phil-davis commented Jul 30, 2024

The commit messages do not comply with the policy.
See #41301 for a branch that I made with the commit messages adjusted. I think that is what we will need to merge-back.

@owncloud owncloud deleted a comment from update-docs bot Jul 30, 2024
@phil-davis phil-davis mentioned this pull request Jul 30, 2024
11 tasks
@phil-davis
Copy link
Contributor Author

Done in #41301

@phil-davis phil-davis closed this Aug 5, 2024
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