From 1c353e497efa73b18e57c6ebf6c36e146b1a8c6f Mon Sep 17 00:00:00 2001
From: Jason Aquino <gitlabjason@mindtester.com>
Date: Thu, 15 Sep 2016 12:12:15 -0400
Subject: [PATCH] fixed incorrect reference to @repository.root_ref in
_readme.html.haml. #22083
---
CHANGELOG | 1 +
app/views/projects/tree/_readme.html.haml | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG b/CHANGELOG
index b6a2aa1fe9555..8e06b23a3e436 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -143,6 +143,7 @@ v 8.12.0 (unreleased)
- Fix Gitlab::Popen.popen thread-safety issue
- Add specs to removing project (Katarzyna Kobierska Ula Budziszewska)
- Clean environment variables when running git hooks
+ - Fix non-master branch readme display in tree view
v 8.11.6
- Fix unnecessary horizontal scroll area in pipeline visualizations. !6005
diff --git a/app/views/projects/tree/_readme.html.haml b/app/views/projects/tree/_readme.html.haml
index baaa2caa6de82..a1f4e3e8ed6f3 100644
--- a/app/views/projects/tree/_readme.html.haml
+++ b/app/views/projects/tree/_readme.html.haml
@@ -1,7 +1,7 @@
%article.file-holder.readme-holder
.file-title
= blob_icon readme.mode, readme.name
- = link_to namespace_project_blob_path(@project.namespace, @project, tree_join(@repository.root_ref, @path, readme.name)) do
+ = link_to namespace_project_blob_path(@project.namespace, @project, tree_join(@ref, @path, readme.name)) do
%strong
= readme.name
.file-content.wiki
--
GitLab