Merge branch 'gitaly-dont-use-path' into 'master'

Remove silly use of repo disk path

See merge request gitlab-org/gitlab-ce!20436
This commit is contained in:
Sean McGivern 2018-07-06 16:13:08 +00:00
commit 0b1543e1c9
1 changed files with 2 additions and 2 deletions

View File

@ -83,7 +83,7 @@ class Repository
@raw_repository&.cleanup
end
# Return absolute path to repository
# Don't use this! It's going away. Use Gitaly to read or write from repos.
def path_to_repo
@path_to_repo ||=
begin
@ -250,7 +250,7 @@ class Repository
# This will still fail if the file is corrupted (e.g. 0 bytes)
raw_repository.write_ref(keep_around_ref_name(sha), sha, shell: false)
rescue Gitlab::Git::CommandError => ex
Rails.logger.error "Unable to create keep-around reference for repository #{path}: #{ex}"
Rails.logger.error "Unable to create keep-around reference for repository #{disk_path}: #{ex}"
end
def kept_around?(sha)