Make disk_path keyword argument and optional

This commit is contained in:
Gabriel Mazetto 2017-07-23 09:05:34 +02:00
parent fb06a4d8fe
commit 16107364b8
4 changed files with 7 additions and 8 deletions

View File

@ -480,7 +480,7 @@ class Project < ActiveRecord::Base
end
def repository
@repository ||= Repository.new(full_path, disk_path, self)
@repository ||= Repository.new(full_path, self, disk_path: disk_path)
end
def container_registry_url
@ -980,9 +980,8 @@ class Project < ActiveRecord::Base
# Expires various caches before a project is renamed.
def expire_caches_before_rename(old_path)
# TODO: if we start using UUIDs for cache, we don't need to do this HACK anymore
repo = Repository.new(old_path, old_path, self)
wiki = Repository.new("#{old_path}.wiki", "#{old_path}.wiki", self)
repo = Repository.new(old_path, self)
wiki = Repository.new("#{old_path}.wiki", self)
if repo.exists?
repo.before_delete

View File

@ -138,7 +138,7 @@ class ProjectWiki
end
def repository
@repository ||= Repository.new(full_path, disk_path, @project)
@repository ||= Repository.new(full_path, @project, disk_path: disk_path)
end
def default_branch

View File

@ -52,9 +52,9 @@ class Repository
end
end
def initialize(full_path, disk_path, project)
def initialize(full_path, project, disk_path: nil)
@full_path = full_path
@disk_path = disk_path
@disk_path = disk_path || full_path
@project = project
end

View File

@ -127,7 +127,7 @@ module Projects
def flush_caches(project)
project.repository.before_delete
Repository.new(wiki_path, repo_path, project).before_delete
Repository.new(wiki_path, project, disk_path: repo_path).before_delete
end
end
end