summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabriel Mazetto <brodock@gmail.com>2018-08-21 20:41:22 +0200
committerGabriel Mazetto <brodock@gmail.com>2018-08-22 05:41:15 +0200
commit7b7969bf15894660411d8ea53f4fa5101c6571b4 (patch)
treea63b82e6ab63d8d87b1e0ff3ef93b447a0f84ee9
parent61c35b6ca1840507f5da3aa4d951e4273e612d66 (diff)
downloadgitlab-ce-7b7969bf15894660411d8ea53f4fa5101c6571b4.tar.gz
Rename feature flag to skip_hashed_storage_upgrade to be less confusing50345-hashed-storage-feature-flag
-rw-r--r--app/models/project.rb2
-rw-r--r--spec/models/project_spec.rb4
-rw-r--r--spec/services/projects/update_service_spec.rb6
3 files changed, 6 insertions, 6 deletions
diff --git a/app/models/project.rb b/app/models/project.rb
index 40dad8cfb36..178d70757a1 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -2074,7 +2074,7 @@ class Project < ActiveRecord::Base
def rename_or_migrate_repository!
if Gitlab::CurrentSettings.hashed_storage_enabled? &&
storage_upgradable? &&
- Feature.disabled?(:disable_hashed_storage_upgrade) # kill switch in case we need to disable upgrade behavior
+ Feature.disabled?(:skip_hashed_storage_upgrade) # kill switch in case we need to disable upgrade behavior
::Projects::HashedStorageMigrationService.new(self, full_path_was).execute
else
storage.rename_repo
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index 6f82a83ddd2..7cfffbde42f 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -2989,7 +2989,7 @@ describe Project do
# call. This makes testing a bit easier.
allow(project).to receive(:gitlab_shell).and_return(gitlab_shell)
allow(project).to receive(:previous_changes).and_return('path' => ['foo'])
- stub_feature_flags(disable_hashed_storage_upgrade: false)
+ stub_feature_flags(skip_hashed_storage_upgrade: false)
end
it 'renames a repository' do
@@ -3161,7 +3161,7 @@ describe Project do
# call. This makes testing a bit easier.
allow(project).to receive(:gitlab_shell).and_return(gitlab_shell)
allow(project).to receive(:previous_changes).and_return('path' => ['foo'])
- stub_feature_flags(disable_hashed_storage_upgrade: false)
+ stub_feature_flags(skip_hashed_storage_upgrade: false)
end
context 'migration to hashed storage' do
diff --git a/spec/services/projects/update_service_spec.rb b/spec/services/projects/update_service_spec.rb
index bc8bda1000e..695b9980548 100644
--- a/spec/services/projects/update_service_spec.rb
+++ b/spec/services/projects/update_service_spec.rb
@@ -262,7 +262,7 @@ describe Projects::UpdateService do
context 'when hashed storage is enabled' do
before do
stub_application_setting(hashed_storage_enabled: true)
- stub_feature_flags(disable_hashed_storage_upgrade: false)
+ stub_feature_flags(skip_hashed_storage_upgrade: false)
end
it 'migrates project to a hashed storage instead of renaming the repo to another legacy name' do
@@ -274,9 +274,9 @@ describe Projects::UpdateService do
expect(project.reload.hashed_storage?(:repository)).to be_truthy
end
- context 'when disable_hashed_storage_upgrade feature flag is enabled' do
+ context 'when skip_hashed_storage_upgrade feature flag is enabled' do
before do
- stub_feature_flags(disable_hashed_storage_upgrade: true)
+ stub_feature_flags(skip_hashed_storage_upgrade: true)
end
it 'renames the project without upgrading it' do