diff options
| -rw-r--r-- | app/models/project.rb | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/53700-hashed-storagemigration.yml | 5 | ||||
| -rw-r--r-- | spec/models/project_spec.rb | 8 |
3 files changed, 14 insertions, 1 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index d87fc1e4b86..7bd44f6a37c 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -1968,7 +1968,7 @@ class Project < ActiveRecord::Base end def migrate_to_hashed_storage! - return if hashed_storage?(:repository) + return unless storage_upgradable? update!(repository_read_only: true) diff --git a/changelogs/unreleased/53700-hashed-storagemigration.yml b/changelogs/unreleased/53700-hashed-storagemigration.yml new file mode 100644 index 00000000000..899012ffd22 --- /dev/null +++ b/changelogs/unreleased/53700-hashed-storagemigration.yml @@ -0,0 +1,5 @@ +--- +title: 'Hashed Storage: allow migration to be retried in partially migrated projects' +merge_request: 23087 +author: +type: fixed diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb index bdff68cee8b..51278836604 100644 --- a/spec/models/project_spec.rb +++ b/spec/models/project_spec.rb @@ -3087,6 +3087,14 @@ describe Project do it 'does not flag as read-only' do expect { project.migrate_to_hashed_storage! }.not_to change { project.repository_read_only } end + + context 'when partially migrated' do + it 'returns true' do + project = create(:project, storage_version: 1, skip_disk_validation: true) + + expect(project.migrate_to_hashed_storage!).to be_truthy + end + end end end |