Fix README detection for subdir

41f63acc · Dmitriy Zaporozhets · 5c67c887 · 41f63acc
Commit 41f63acc authored Oct 13, 2013 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

app/models/tree.rb app/models/tree.rb +2 -1

No files found.
--- 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