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

Remove legacy storage path call

See merge request gitlab-org/gitlab-ce!18598
This commit is contained in:
Douwe Maan 2018-04-30 10:17:09 +00:00
commit 660a902891
2 changed files with 7 additions and 2 deletions

View File

@ -12,7 +12,7 @@ module Gitlab
# 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 @@ module Gitlab
# 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 @@ module Gitlab
env
end
def path
@repository.path
end
private
# Must return an object that responds to 'address' and 'storage'.

View File

@ -1179,6 +1179,8 @@ module Gitlab
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