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

[stable26] fix: Avoid conflicts on deck attachments folder name #5708

Merged
merged 3 commits into from
May 24, 2024

Conversation

backportbot[bot]
Copy link

@backportbot backportbot bot commented Mar 27, 2024

Backport of #5703

Warning, This backport's changes differ from the original and might be incomplete ⚠️

Todo

  • Review and resolve any conflicts
  • Remove all the empty commits

Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Copy link
Contributor

🐢 Performance warning.
It looks like the query count of the integration tests increased with this PR.
Database query count is now 65280 was 61324 (+6.45%)
Please check your code again. If you added a new test this can be expected and the base value in tests/integration/base-query-count.txt can be increased.

Copy link

cypress bot commented Mar 27, 2024

Passing run #1891 ↗︎

0 15 0 0 Flakiness 0

Details:

Merge e919597 into 413d32f...
Project: Deck Commit: 750af80823 ℹ️
Status: Passed Duration: 01:31 💡
Started: May 23, 2024 5:14 PM Ended: May 23, 2024 5:16 PM

Review all test suite changes for PR #5708 ↗︎

Signed-off-by: Luka Trovic <luka@nextcloud.com>
@luka-nextcloud luka-nextcloud marked this pull request as ready for review May 23, 2024 17:15
@blizzz blizzz merged commit 49225a7 into stable26 May 24, 2024
26 checks passed
@delete-merged-branch delete-merged-branch bot deleted the backport/5703/stable26 branch May 24, 2024 08:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants