diff options
author | Jakub Jirutka <jakub@jirutka.cz> | 2015-05-11 01:34:32 +0200 |
---|---|---|
committer | Jakub Jirutka <jakub@jirutka.cz> | 2015-05-11 02:07:26 +0200 |
commit | f7adac87fe824a453197f0be547c35684d468dd7 (patch) | |
tree | 9f3954377289efaca06177bab214c4069f176dee /lib/gitlab/markdown.rb | |
parent | 6fdc51f81d013a1e01c0742e81cdd0fa5476e2d6 (diff) | |
download | gitlab-ce-f7adac87fe824a453197f0be547c35684d468dd7.tar.gz |
Extract handling of relative file links to RelativeLinkFilter
Diffstat (limited to 'lib/gitlab/markdown.rb')
-rw-r--r-- | lib/gitlab/markdown.rb | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/gitlab/markdown.rb b/lib/gitlab/markdown.rb index 63294aa54c0..dadd0e0d64b 100644 --- a/lib/gitlab/markdown.rb +++ b/lib/gitlab/markdown.rb @@ -15,6 +15,7 @@ module Gitlab autoload :IssueReferenceFilter, 'gitlab/markdown/issue_reference_filter' autoload :LabelReferenceFilter, 'gitlab/markdown/label_reference_filter' autoload :MergeRequestReferenceFilter, 'gitlab/markdown/merge_request_reference_filter' + autoload :RelativeLinkFilter, 'gitlab/markdown/relative_link_filter' autoload :SanitizationFilter, 'gitlab/markdown/sanitization_filter' autoload :SnippetReferenceFilter, 'gitlab/markdown/snippet_reference_filter' autoload :TableOfContentsFilter, 'gitlab/markdown/table_of_contents_filter' @@ -64,7 +65,12 @@ module Gitlab current_user: current_user, only_path: options[:reference_only_path], project: project, - reference_class: html_options[:class] + reference_class: html_options[:class], + + # RelativeLinkFilter + ref: @ref, + requested_path: @path, + project_wiki: @project_wiki } result = pipeline.call(text, context) @@ -91,6 +97,8 @@ module Gitlab [ Gitlab::Markdown::SanitizationFilter, + Gitlab::Markdown::RelativeLinkFilter, + Gitlab::Markdown::EmojiFilter, Gitlab::Markdown::TableOfContentsFilter, Gitlab::Markdown::AutolinkFilter, |