diff options
| -rw-r--r-- | app/models/repository.rb | 10 | ||||
| -rw-r--r-- | lib/api/files.rb | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/app/models/repository.rb b/app/models/repository.rb index bedb3be88c5..58eab25b283 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -654,19 +654,19 @@ class Repository end def last_commit_for_path(sha, path) - sha = cache_last_commit_sha_for_path(sha, path) + sha = cache_last_commit_id_for_path(sha, path) commit(sha) end - def last_commit_sha_for_path(sha, path) + def last_commit_id_for_path(sha, path) args = %W(#{Gitlab.config.git.bin_path} rev-list --max-count=1 #{sha} -- #{path}) Gitlab::Popen.popen(args, path_to_repo).first.strip end - def cache_last_commit_sha_for_path(sha, path) - key = path.blank? ? "last_commit_sha_for_path:#{sha}" : "last_commit_id_for_path:#{sha}:#{Digest::SHA1.hexdigest(path)}" + def cache_last_commit_id_for_path(sha, path) + key = path.blank? ? "last_commit_id_for_path:#{sha}" : "last_commit_id_for_path:#{sha}:#{Digest::SHA1.hexdigest(path)}" cache.fetch(key) do - last_commit_sha_for_path(sha, path) + last_commit_id_for_path(sha, path) end end diff --git a/lib/api/files.rb b/lib/api/files.rb index 187e2f3434d..f95b9be1722 100644 --- a/lib/api/files.rb +++ b/lib/api/files.rb @@ -70,7 +70,7 @@ module API ref: params[:ref], blob_id: blob.id, commit_id: commit.id, - last_commit_id: repo.cache_last_commit_sha_for_path(commit.sha, params[:file_path]) + last_commit_id: repo.cache_last_commit_id_for_path(commit.sha, params[:file_path]) } end |