Skip to content

fix(encryption): recovery keys should be shown when user keys are used#60741

Merged
artonge merged 2 commits into
masterfrom
fix/reverse-logic
May 28, 2026
Merged

fix(encryption): recovery keys should be shown when user keys are used#60741
artonge merged 2 commits into
masterfrom
fix/reverse-logic

Conversation

@susnux
Copy link
Copy Markdown
Contributor

@susnux susnux commented May 26, 2026

cc @come-nc

Checklist

AI (if applicable)

  • The content of this PR was partly or fully generated using AI

@susnux susnux requested a review from come-nc May 26, 2026 16:20
@susnux susnux requested a review from a team as a code owner May 26, 2026 16:20
@susnux susnux requested review from nfebe, skjnldsv and sorbaugh and removed request for a team May 26, 2026 16:20
@come-nc
Copy link
Copy Markdown
Contributor

come-nc commented May 28, 2026

/compile /

@come-nc
Copy link
Copy Markdown
Contributor

come-nc commented May 28, 2026

/compile rebase

susnux and others added 2 commits May 28, 2026 10:09
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
@come-nc come-nc enabled auto-merge May 28, 2026 10:19
@come-nc come-nc added the 4. to release Ready to be released and/or waiting for tests to finish label May 28, 2026
@come-nc come-nc added this to the Nextcloud 35 milestone May 28, 2026
@come-nc
Copy link
Copy Markdown
Contributor

come-nc commented May 28, 2026

cypress failures are unrelated, can be force-merged

@artonge artonge disabled auto-merge May 28, 2026 11:50
@artonge artonge merged commit 1e8b4a0 into master May 28, 2026
125 of 128 checks passed
@artonge artonge deleted the fix/reverse-logic branch May 28, 2026 11:51
@come-nc
Copy link
Copy Markdown
Contributor

come-nc commented May 28, 2026

/backport to stable34

@come-nc
Copy link
Copy Markdown
Contributor

come-nc commented May 28, 2026

/backport to stable33

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

4. to release Ready to be released and/or waiting for tests to finish bug feature: encryption (server-side)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants