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

[stable25] fix: Avoid conflicts on deck attachments folder name #5707

Merged
merged 5 commits into from
Jul 12, 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>
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 79470 was 68024 (+16.82%)
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 28, 2024

Passing run #1927 ↗︎

0 6 0 0 Flakiness 0

Details:

Merge 54b62fe into 6dee849...
Project: Deck Commit: df64c962ed ℹ️
Status: Passed Duration: 01:07 💡
Started: Jul 12, 2024 6:54 AM Ended: Jul 12, 2024 6:55 AM

Review all test suite changes for PR #5707 ↗︎

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
Copy link
Member

@blizzz blizzz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With doubt on the query count change.

@@ -1 +1 @@
68024
79470
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

weirdly high, innit?

Signed-off-by: Luka Trovic <luka@nextcloud.com>
@juliushaertl juliushaertl merged commit 15d7098 into stable25 Jul 12, 2024
25 checks passed
@juliushaertl juliushaertl deleted the backport/5703/stable25 branch July 12, 2024 06:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: ☑️ Done
Development

Successfully merging this pull request may close these issues.

None yet

3 participants