Rename ensure_dir_exist -> ensure_storage_path_exist
This commit is contained in:
parent
07b574b41c
commit
597e619080
5 changed files with 6 additions and 6 deletions
|
@ -6,7 +6,7 @@ module Storage
|
|||
full_path
|
||||
end
|
||||
|
||||
def ensure_dir_exist
|
||||
def ensure_storage_path_exist
|
||||
gitlab_shell.add_namespace(repository_storage_path, namespace.full_path)
|
||||
end
|
||||
|
||||
|
|
|
@ -44,7 +44,7 @@ class Project < ActiveRecord::Base
|
|||
default_value_for :snippets_enabled, gitlab_config_features.snippets
|
||||
default_value_for :only_allow_merge_if_all_discussions_are_resolved, false
|
||||
|
||||
after_create :ensure_dir_exist
|
||||
after_create :ensure_storage_path_exist
|
||||
after_create :create_project_feature, unless: :project_feature
|
||||
after_save :update_project_statistics, if: :namespace_id_changed?
|
||||
|
||||
|
@ -69,7 +69,7 @@ class Project < ActiveRecord::Base
|
|||
|
||||
# Legacy Storage specific hooks
|
||||
|
||||
after_save :ensure_dir_exist, if: :namespace_id_changed?
|
||||
after_save :ensure_storage_path_exist, if: :namespace_id_changed?
|
||||
|
||||
acts_as_taggable
|
||||
|
||||
|
|
|
@ -75,7 +75,7 @@ module Backup
|
|||
path_to_project_repo = path_to_repo(project)
|
||||
path_to_project_bundle = path_to_bundle(project)
|
||||
|
||||
project.ensure_dir_exist
|
||||
project.ensure_storage_path_exist
|
||||
|
||||
cmd = if File.exist?(path_to_project_bundle)
|
||||
%W(#{Gitlab.config.git.bin_path} clone --bare #{path_to_project_bundle} #{path_to_project_repo})
|
||||
|
|
|
@ -4,7 +4,7 @@ require Rails.root.join('db', 'post_migrate', '20170502101023_cleanup_namespacel
|
|||
describe CleanupNamespacelessPendingDeleteProjects do
|
||||
before do
|
||||
# Stub after_save callbacks that will fail when Project has no namespace
|
||||
allow_any_instance_of(Project).to receive(:ensure_dir_exist).and_return(nil)
|
||||
allow_any_instance_of(Project).to receive(:ensure_storage_path_exist).and_return(nil)
|
||||
allow_any_instance_of(Project).to receive(:update_project_statistics).and_return(nil)
|
||||
end
|
||||
|
||||
|
|
|
@ -5,7 +5,7 @@ describe NamespacelessProjectDestroyWorker do
|
|||
|
||||
before do
|
||||
# Stub after_save callbacks that will fail when Project has no namespace
|
||||
allow_any_instance_of(Project).to receive(:ensure_dir_exist).and_return(nil)
|
||||
allow_any_instance_of(Project).to receive(:ensure_storage_path_exist).and_return(nil)
|
||||
allow_any_instance_of(Project).to receive(:update_project_statistics).and_return(nil)
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in a new issue