Commit c9ae679c authored by Gabriel Mazetto's avatar Gabriel Mazetto

Rename ensure_dir_exist -> ensure_storage_path_exist

parent 5516886b
...@@ -6,7 +6,7 @@ module Storage ...@@ -6,7 +6,7 @@ module Storage
full_path full_path
end end
def ensure_dir_exist def ensure_storage_path_exist
gitlab_shell.add_namespace(repository_storage_path, namespace.full_path) gitlab_shell.add_namespace(repository_storage_path, namespace.full_path)
end end
......
...@@ -47,7 +47,7 @@ class Project < ActiveRecord::Base ...@@ -47,7 +47,7 @@ class Project < ActiveRecord::Base
default_value_for :snippets_enabled, gitlab_config_features.snippets default_value_for :snippets_enabled, gitlab_config_features.snippets
default_value_for :only_allow_merge_if_all_discussions_are_resolved, false 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_create :create_project_feature, unless: :project_feature
after_save :update_project_statistics, if: :namespace_id_changed? after_save :update_project_statistics, if: :namespace_id_changed?
...@@ -72,7 +72,7 @@ class Project < ActiveRecord::Base ...@@ -72,7 +72,7 @@ class Project < ActiveRecord::Base
# Legacy Storage specific hooks # 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 acts_as_taggable
......
...@@ -16,7 +16,7 @@ module Geo ...@@ -16,7 +16,7 @@ module Geo
project.expire_caches_before_rename(old_path_with_namespace) project.expire_caches_before_rename(old_path_with_namespace)
# Make sure target directory exists (used when transfering repositories) # Make sure target directory exists (used when transfering repositories)
project.ensure_dir_exist project.ensure_storage_path_exist
if gitlab_shell.mv_repository(project.repository_storage_path, if gitlab_shell.mv_repository(project.repository_storage_path,
old_path_with_namespace, new_path_with_namespace) old_path_with_namespace, new_path_with_namespace)
......
...@@ -5,7 +5,7 @@ class GeoRepositoryCreateWorker ...@@ -5,7 +5,7 @@ class GeoRepositoryCreateWorker
def perform(id) def perform(id)
project = Project.find(id) project = Project.find(id)
project.ensure_dir_exist project.ensure_storage_path_exist
project.create_repository unless project.repository_exists? || project.import? project.create_repository unless project.repository_exists? || project.import?
end end
end end
...@@ -75,7 +75,7 @@ module Backup ...@@ -75,7 +75,7 @@ module Backup
path_to_project_repo = path_to_repo(project) path_to_project_repo = path_to_repo(project)
path_to_project_bundle = path_to_bundle(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) cmd = if File.exist?(path_to_project_bundle)
%W(#{Gitlab.config.git.bin_path} clone --bare #{path_to_project_bundle} #{path_to_project_repo}) %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 ...@@ -4,7 +4,7 @@ require Rails.root.join('db', 'post_migrate', '20170502101023_cleanup_namespacel
describe CleanupNamespacelessPendingDeleteProjects do describe CleanupNamespacelessPendingDeleteProjects do
before do before do
# Stub after_save callbacks that will fail when Project has no namespace # 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) allow_any_instance_of(Project).to receive(:update_project_statistics).and_return(nil)
end end
......
...@@ -5,7 +5,7 @@ describe NamespacelessProjectDestroyWorker do ...@@ -5,7 +5,7 @@ describe NamespacelessProjectDestroyWorker do
before do before do
# Stub after_save callbacks that will fail when Project has no namespace # 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) allow_any_instance_of(Project).to receive(:update_project_statistics).and_return(nil)
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment