diff options
author | Robert Speicher <robert@gitlab.com> | 2016-05-10 17:07:10 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2016-05-10 17:07:10 +0000 |
commit | 0cc8cee6cd58cfa8e34eccccb14fb146630f9cb7 (patch) | |
tree | e71ae516a07721127dc7955e339d54d589cffbca /lib/banzai | |
parent | 98d8e3fe9ff4d120469378490c41381ae751597e (diff) | |
parent | 535be93a77ec677dbb561f8c1545a60d0d908832 (diff) | |
download | gitlab-ce-0cc8cee6cd58cfa8e34eccccb14fb146630f9cb7.tar.gz |
Merge branch 'fix/using-uploads-in-global-snippets' into 'master'
Fix using link to uploads in global snippets
Closes #17342, closes #17363
See merge request !4085
Diffstat (limited to 'lib/banzai')
-rw-r--r-- | lib/banzai/filter/upload_link_filter.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/banzai/filter/upload_link_filter.rb b/lib/banzai/filter/upload_link_filter.rb index 7edfe5ade2d..c0f503c9af3 100644 --- a/lib/banzai/filter/upload_link_filter.rb +++ b/lib/banzai/filter/upload_link_filter.rb @@ -8,6 +8,8 @@ module Banzai # class UploadLinkFilter < HTML::Pipeline::Filter def call + return doc unless project + doc.search('a').each do |el| process_link_attr el.attribute('href') end @@ -31,7 +33,11 @@ module Banzai end def build_url(uri) - File.join(Gitlab.config.gitlab.url, context[:project].path_with_namespace, uri) + File.join(Gitlab.config.gitlab.url, project.path_with_namespace, uri) + end + + def project + context[:project] end # Ensure that a :project key exists in context |