diff options
author | Douwe Maan <douwe@selenight.nl> | 2017-12-11 17:23:29 +0100 |
---|---|---|
committer | Douwe Maan <douwe@selenight.nl> | 2017-12-12 09:48:06 +0100 |
commit | e8d0d6ba9eeedf3d895ceb5e679866d4889cbf36 (patch) | |
tree | 6db6475389fba0c53fe4500df63ab1466e967ed1 /app/helpers/blob_helper.rb | |
parent | fb47f2a7459f4c413f3fe496bcdb1b40d81d73a4 (diff) | |
download | gitlab-ce-e8d0d6ba9eeedf3d895ceb5e679866d4889cbf36.tar.gz |
Use app host instead of asset host when rendering image blob or diffdm-image-blob-diff-full-url
Diffstat (limited to 'app/helpers/blob_helper.rb')
-rw-r--r-- | app/helpers/blob_helper.rb | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/app/helpers/blob_helper.rb b/app/helpers/blob_helper.rb index 18075ee8be7..556ed233ccf 100644 --- a/app/helpers/blob_helper.rb +++ b/app/helpers/blob_helper.rb @@ -118,20 +118,24 @@ module BlobHelper icon("#{file_type_icon_class('file', mode, name)} fw") end - def blob_raw_path + def blob_raw_url(only_path: false) if @build && @entry - raw_project_job_artifacts_path(@project, @build, path: @entry.path) + raw_project_job_artifacts_url(@project, @build, path: @entry.path, only_path: only_path) elsif @snippet if @snippet.project_id - raw_project_snippet_path(@project, @snippet) + raw_project_snippet_url(@project, @snippet, only_path: only_path) else - raw_snippet_path(@snippet) + raw_snippet_url(@snippet, only_path: only_path) end elsif @blob - project_raw_path(@project, @id) + project_raw_url(@project, @id, only_path: only_path) end end + def blob_raw_path + blob_raw_url(only_path: true) + end + # SVGs can contain malicious JavaScript; only include whitelisted # elements and attributes. Note that this whitelist is by no means complete # and may omit some elements. |