diff options
| author | Jason Aquino <gitlabjason@mindtester.com> | 2016-09-15 12:12:15 -0400 |
|---|---|---|
| committer | Jason Aquino <gitlabjason@mindtester.com> | 2016-09-16 06:49:17 -0400 |
| commit | 1c353e497efa73b18e57c6ebf6c36e146b1a8c6f (patch) | |
| tree | 6e446c573688f82b27b59b76e44de5b34e00eeb3 | |
| parent | 065341bf04958b862db9cc2891c7822a3da7f7f8 (diff) | |
| download | gitlab-ce-1c353e497efa73b18e57c6ebf6c36e146b1a8c6f.tar.gz | |
fixed incorrect reference to @repository.root_ref in _readme.html.haml. #22083
| -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 b6a2aa1fe95..8e06b23a3e4 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 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 |