Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

O

our_own_cloud_project
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Incidents

Snippets Groups Projects

d6f02eb7

Commit d6f02eb7 authored 9 years ago by Thomas Müller

Downloads
- Plain Diff

Merge pull request #17500 from owncloud/encryption_migration_improvements

Only clean up if migration finished succesfully

parents bfb90d10 1e284b15

Branches

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

apps/encryption/command/migratekeys.php 2 additions, 0 deletions

apps/encryption/command/migratekeys.php
apps/encryption/lib/keymanager.php 21 additions, 4 deletions

apps/encryption/lib/keymanager.php
apps/encryption/lib/migration.php 1 addition, 1 deletion

apps/encryption/lib/migration.php
apps/encryption/tests/lib/KeyManagerTest.php 47 additions, 3 deletions

apps/encryption/tests/lib/KeyManagerTest.php
settings/controller/encryptioncontroller.php 2 additions, 0 deletions

settings/controller/encryptioncontroller.php

with 73 additions and 8 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment