Read about our upcoming Code of Conduct on this issue

Commit 968d736e authored by Douwe Maan's avatar Douwe Maan
Browse files

Merge branch 'zj-remove-repo-path-remote-repository' into 'master'

Remove legacy storage path call

See merge request gitlab-org/gitlab-ce!18598
......@@ -12,7 +12,7 @@ module Git
# class.
#
class RemoteRepository
attr_reader :path, :relative_path, :gitaly_repository
attr_reader :relative_path, :gitaly_repository
def initialize(repository)
@relative_path = repository.relative_path
......@@ -21,7 +21,6 @@ def initialize(repository)
# These instance variables will not be available in gitaly-ruby, where
# we have no disk access to this repository.
@repository = repository
@path = repository.path
end
def empty?
......@@ -69,6 +68,10 @@ def fetch_env
env
end
def path
@repository.path
end
private
# Must return an object that responds to 'address' and 'storage'.
......
......@@ -1179,6 +1179,8 @@ def fetch_ref(source_repository, source_ref:, target_ref:)
if is_enabled
gitaly_fetch_ref(source_repository, source_ref: source_ref, target_ref: target_ref)
else
# When removing this code, also remove source_repository#path
# to remove deprecated method calls
local_fetch_ref(source_repository.path, source_ref: source_ref, target_ref: target_ref)
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