Skip to content

[stable25] Prevent file deletion when pressing Ctrl+Delete#3515

Merged
PVince81 merged 3 commits into
stable25from
backport/3503/stable25
Dec 6, 2022
Merged

[stable25] Prevent file deletion when pressing Ctrl+Delete#3515
PVince81 merged 3 commits into
stable25from
backport/3503/stable25

Conversation

@backportbot-nextcloud

@backportbot-nextcloud backportbot-nextcloud Bot commented Dec 5, 2022

Copy link
Copy Markdown
  • ⚠️ This backport had conflicts and is incomplete

backport of #3503

Fix #3391

Signed-off-by: jeremy238 <113722664+jeremy238@users.noreply.github.com>
Signed-off-by: jeremy238 <113722664+jeremy238@users.noreply.github.com>
@backportbot-nextcloud backportbot-nextcloud Bot added the bug Something isn't working label Dec 5, 2022
@backportbot-nextcloud backportbot-nextcloud Bot added this to the Nextcloud 25.0.2 milestone Dec 5, 2022
@cypress

cypress Bot commented Dec 5, 2022

Copy link
Copy Markdown



Test summary

98 0 0 0Flakiness 4


Run details

Project Text
Status Passed
Commit 3d59307 ℹ️
Started Dec 6, 2022 2:14 PM
Ended Dec 6, 2022 2:20 PM
Duration 06:06 💡
OS Linux Ubuntu - 22.04
Browser Electron 106

View run in Cypress Dashboard ➡️


Flakiness

links.spec.js Flakiness
1 test link marks > link preview > shows a link preview
2 test link marks > link preview > does not show a link preview for links within a paragraph
sections.spec.js Flakiness
1 Content Sections > Heading anchors > Anchor scrolls into view
mentions.spec.js Flakiness
1 Test mentioning users > Type @ and see the user list

This comment has been generated by cypress-bot as a result of this project's GitHub integration settings. You can manage this integration in this project's settings in the Cypress Dashboard

@PVince81

PVince81 commented Dec 6, 2022

Copy link
Copy Markdown
Member

@mejo- please resolve the conflict and then tick the checkbox

@mejo-

mejo- commented Dec 6, 2022

Copy link
Copy Markdown
Member

/compile

@blizzz blizzz mentioned this pull request Dec 6, 2022
1 task
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
@mejo-

mejo- commented Dec 6, 2022

Copy link
Copy Markdown
Member

Ready to be merged @PVince81.

@PVince81 PVince81 merged commit c661926 into stable25 Dec 6, 2022
@delete-merged-branch delete-merged-branch Bot deleted the backport/3503/stable25 branch December 6, 2022 14:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug Something isn't working

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants