From 7d23a2bfdf9a67ece2397d19b1d62076559d01cb Mon Sep 17 00:00:00 2001 From: Zeger-Jan van de Weg Date: Thu, 26 Apr 2018 09:50:48 +0200 Subject: [PATCH] Remove legacy storage path call Storage shards should only be used, the exact paths are the responsibilty of Gitaly. This will create deprecation warning, and in this instance the path is initialized, but never used so it could be removed. --- lib/gitlab/git/remote_repository.rb | 7 +++++-- lib/gitlab/git/repository.rb | 2 ++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/gitlab/git/remote_repository.rb b/lib/gitlab/git/remote_repository.rb index 6bd6e58feeb..f40e59a8dd0 100644 --- a/lib/gitlab/git/remote_repository.rb +++ b/lib/gitlab/git/remote_repository.rb @@ -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'. diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb index 5a6e2e0b937..83b686bc058 100644 --- a/lib/gitlab/git/repository.rb +++ b/lib/gitlab/git/repository.rb @@ -1187,6 +1187,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