diff options
author | Rémy Coutable <remy@rymai.me> | 2016-09-16 12:32:22 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-09-16 12:32:22 +0000 |
commit | ebf541e569e2fc3c07f7a05a361594f172296587 (patch) | |
tree | 729059718491befdea46666a73fc9a7320c5378f | |
parent | 591885ce3f5bc0102b5391d9205bbe04e55ca843 (diff) | |
parent | 1c353e497efa73b18e57c6ebf6c36e146b1a8c6f (diff) | |
download | gitlab-ce-ebf541e569e2fc3c07f7a05a361594f172296587.tar.gz |
Merge branch 'issue-22083' into 'master'
Fixes incorrect reference to `@repository.root_ref` in _readme.html.haml.
Fixes #22083
See merge request !6369
-rw-r--r-- | CHANGELOG | 1 | ||||
-rw-r--r-- | app/views/projects/tree/_readme.html.haml | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 8cbc970c4cf..950a44acc47 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -144,6 +144,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 baaa2caa6de..a1f4e3e8ed6 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 |