From 41f63acc84ac0f8f348c8393f4094b2aa597461c Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Sun, 13 Oct 2013 16:03:16 +0300 Subject: [PATCH] Fix README detection for subdir --- app/models/tree.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/models/tree.rb b/app/models/tree.rb index 5fbad19..ed06cb1 100644 --- a/app/models/tree.rb +++ b/app/models/tree.rb @@ -7,7 +7,8 @@ class Tree @entries = Gitlab::Git::Tree.where(git_repo, sha, path) if readme_tree = @entries.find(&:readme?) - @readme = Gitlab::Git::Blob.find(git_repo, sha, readme_tree.name) + readme_path = path == '/' ? readme_tree.name : File.join(path, readme_tree.name) + @readme = Gitlab::Git::Blob.find(git_repo, sha, readme_path) end end -- libgit2 0.21.2