summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2018-07-06 16:13:08 +0000
committerSean McGivern <sean@mcgivern.me.uk>2018-07-06 16:13:08 +0000
commit0b1543e1c9b850ec35a6dfc0586f6b9588e9b953 (patch)
treed40c98ae5659002a70bb3185543cb27dac668048
parent7a17f8d85deb50c933d6a82a354c3e58dc614544 (diff)
parent359ca277d1d341cc044223cd98b58246f779d7c1 (diff)
downloadgitlab-ce-0b1543e1c9b850ec35a6dfc0586f6b9588e9b953.tar.gz
Merge branch 'gitaly-dont-use-path' into 'master'
Remove silly use of repo disk path See merge request gitlab-org/gitlab-ce!20436
-rw-r--r--app/models/repository.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/repository.rb b/app/models/repository.rb
index 5f9894f1168..22a4b73b4b0 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -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)