Commit c86e0d36 authored by Sean McGivern's avatar Sean McGivern
Browse files

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

Remove silly use of repo disk path

See merge request gitlab-org/gitlab-ce!20436
......@@ -83,7 +83,7 @@ def cleanup
@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 @@ def keep_around(sha)
# 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)
......
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