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.

Sign up for GitHub

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

Jump to bottom

[stable25] fix: Ensure to not persist user put into the session for direct editing #4004

Merged
merged 1 commit into from
Apr 5, 2023
Merged

[stable25] fix: Ensure to not persist user put into the session for direct editing #4004

merged 1 commit into from
Apr 5, 2023

Conversation

backportbot-nextcloud[bot]
Copy link

@backportbot-nextcloud backportbot-nextcloud bot commented Mar 28, 2023 •
edited by blizzz
Loading

  • ⚠️ This backport had conflicts that were resolved with the 'ours' merge strategy and is likely incomplete

backport of #3946

@backportbot-nextcloud backportbot-nextcloud bot added the bug Something isn't working label Mar 28, 2023
@backportbot-nextcloud backportbot-nextcloud bot added this to the Nextcloud 25.0.6 milestone Mar 28, 2023
@cypress
Copy link

cypress bot commented Mar 28, 2023 •
edited
Loading

1 failed tests on run #9330 ↗︎

1 99 0 0 Flakiness 0

Details:

Merge f80764a into 8d6853f...
Project: Text Commit: e364f3ba6f ℹ️
Status: Failed Duration: 06:01 💡
Started: Apr 5, 2023 2:07 PM Ended: Apr 5, 2023 2:13 PM
Failed  cypress/e2e/links.spec.js • 1 failed test

View Output Video

Test Artifacts
test link marks > link preview > shows a link preview Output Screenshots

This comment has been generated by cypress-bot as a result of this project's GitHub integration settings.

@blizzz
Copy link
Member

blizzz commented Apr 4, 2023

@juliushaertl conflicts

@blizzz blizzz force-pushed the backport/3946/stable25 branch from 6408e19 to f80764a Compare April 5, 2023 13:16
@blizzz blizzz marked this pull request as ready for review April 5, 2023 13:16
@blizzz
Copy link
Member

blizzz commented Apr 5, 2023

Conflicts were about different parameters in the push() and sync() methods compared to main and stable26.

@juliusknorr
Copy link
Member

Thanks @blizzz Failure is unrelated

@juliusknorr juliusknorr merged commit 36ac2a5 into stable25 Apr 5, 2023
@juliusknorr juliusknorr deleted the backport/3946/stable25 branch April 5, 2023 14:20
@skjnldsv skjnldsv mentioned this pull request Apr 13, 2023
Merged
11 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@juliusknorr juliusknorr juliusknorr approved these changes

@marcelklehr marcelklehr Awaiting requested review from marcelklehr

Assignees
No one assigned
Labels
3. to review bug Something isn't working
Projects
None yet
Milestone
Nextcloud 25.0.6
Development

Successfully merging this pull request may close these issues.
2 participants
@blizzz @juliusknorr