summaryrefslogtreecommitdiff
path: root/app/controllers/projects_controller.rb
diff options
context:
space:
mode:
authorAdam Niedzielski <adamsunday@gmail.com>2016-11-01 10:18:49 +0100
committerAdam Niedzielski <adamsunday@gmail.com>2016-11-01 10:18:49 +0100
commitf6cff8f7bc6608d53baa36768034ab9f91323abe (patch)
treee494c019ab4061d71a72d418dd909670ae24e056 /app/controllers/projects_controller.rb
parent266fcfb1935c8aa8c6ac3d2ae71530c441b08675 (diff)
downloadgitlab-ce-f6cff8f7bc6608d53baa36768034ab9f91323abe.tar.gz
Fix relative links in Markdown wiki when displayed in "Project" tabadam-fix-wiki-links-markdown
Refers to #23806.
Diffstat (limited to 'app/controllers/projects_controller.rb')
-rw-r--r--app/controllers/projects_controller.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 8c148ecfaeb..bce5e29d8d8 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -289,7 +289,8 @@ class ProjectsController < Projects::ApplicationController
render 'projects/empty' if @project.empty_repo?
else
if @project.wiki_enabled?
- @wiki_home = @project.wiki.find_page('home', params[:version_id])
+ @project_wiki = @project.wiki
+ @wiki_home = @project_wiki.find_page('home', params[:version_id])
elsif @project.feature_available?(:issues, current_user)
@issues = issues_collection
@issues = @issues.page(params[:page])