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/diff_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/diff_helper.rb')
-rw-r--r-- | app/helpers/diff_helper.rb | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/app/helpers/diff_helper.rb b/app/helpers/diff_helper.rb index e82136f0177..1ce487e6592 100644 --- a/app/helpers/diff_helper.rb +++ b/app/helpers/diff_helper.rb @@ -104,15 +104,23 @@ module DiffHelper ].join(' ').html_safe end - def diff_file_blob_raw_path(diff_file) - project_raw_path(@project, tree_join(diff_file.content_sha, diff_file.file_path)) + def diff_file_blob_raw_url(diff_file, only_path: false) + project_raw_url(@project, tree_join(diff_file.content_sha, diff_file.file_path), only_path: only_path) end - def diff_file_old_blob_raw_path(diff_file) + def diff_file_old_blob_raw_url(diff_file, only_path: false) sha = diff_file.old_content_sha return unless sha - project_raw_path(@project, tree_join(diff_file.old_content_sha, diff_file.old_path)) + project_raw_url(@project, tree_join(diff_file.old_content_sha, diff_file.old_path), only_path: only_path) + end + + def diff_file_blob_raw_path(diff_file) + diff_file_blob_raw_url(diff_file, only_path: true) + end + + def diff_file_old_blob_raw_path(diff_file) + diff_file_old_blob_raw_url(diff_file, only_path: true) end def diff_file_html_data(project, diff_file_path, diff_commit_id) |