BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Commit e5fb2ad9 by Marin Jankovski
Options

Merge branch 'search-wiki-keyword' into 'master'

Prevent 500 error on search results if description contains relative link Bug: If I add relative link to comment or description and search for it - I get 500 error on search page. Reason for this is that we use `@repository` variable. But for pages like search it does not assigned. In future we should avoid using such variables. Especially in markdown parser that can be used on different pages Fixes #1601 See merge request !1111
parents ea1eda21 1e980ffb
Showing with 6 additions and 1 deletion
app/helpers/gitlab_markdown_helper.rb
...@@ -73,7 +73,12 @@ module GitlabMarkdownHelper ...@@ -73,7 +73,12 @@ module GitlabMarkdownHelper
paths.uniq.each do |file_path| paths.uniq.each do |file_path|
# If project does not have repository # If project does not have repository
# its nothing to rebuild # its nothing to rebuild
if @repository.exists? && !@repository.empty? #
# TODO: pass project variable to markdown helper instead of using
# instance variable. Right now it generates invalid path for pages out
# of project scope. Example: search results where can be rendered markdown
# from different projects
if @repository && @repository.exists? && !@repository.empty?
new_path = rebuild_path(file_path) new_path = rebuild_path(file_path)
# Finds quoted path so we don't replace other mentions of the string # Finds quoted path so we don't replace other mentions of the string
# eg. "doc/api" will be replaced and "/home/doc/api/text" won't # eg. "doc/api" will be replaced and "/home/doc/api/text" won't
......
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