Commit d43d7471 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'fix/relative_render' of /home/git/repositories/gitlab/gitlabhq

parents f81532b5 ad3defa3
......@@ -68,3 +68,8 @@ Feature: Project markdown render
When I go back to wiki page home
And I click on Rake tasks link
Then I see Rake tasks directory
Scenario: I visit the help page with markdown
Given I visit to the help page
And I select a page with markdown
Then I should see a help page with markdown
\ No newline at end of file
......@@ -150,4 +150,16 @@ class Spinach::Features::ProjectMarkdownRender < Spinach::FeatureSteps
page.should have_content "backup_restore.md"
page.should have_content "maintenance.md"
end
Given 'I visit to the help page' do
visit help_path
end
And 'I select a page with markdown' do
click_link "Rake Tasks"
end
Then 'I should see a help page with markdown' do
page.should have_content "GitLab provides some specific rake tasks to enable special features or perform maintenance tasks"
end
end
\ No newline at end of file
......@@ -35,7 +35,11 @@ class Redcarpet::Render::GitlabHTML < Redcarpet::Render::HTML
end
def preprocess(full_document)
h.create_relative_links(full_document, @project.path_with_namespace, @ref, @request_path, is_wiki?)
if @project
h.create_relative_links(full_document, @project.path_with_namespace, @ref, @request_path, is_wiki?)
else
full_document
end
end
def postprocess(full_document)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment