From 1072c95180aa31b999088fec4d14ce6765041a15 Mon Sep 17 00:00:00 2001
From: Tomas Srna <tomas@srna.sk>
Date: Tue, 22 Jul 2014 13:29:41 +0200
Subject: [PATCH] Attachment URL with non-/ relative root
The attachment URL was not working with relative_url_root not equal to '/'. I suggest this fix.
---
app/uploaders/attachment_uploader.rb | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/app/uploaders/attachment_uploader.rb b/app/uploaders/attachment_uploader.rb
index b122b6c8658..24fc294909e 100644
--- a/app/uploaders/attachment_uploader.rb
+++ b/app/uploaders/attachment_uploader.rb
@@ -26,6 +26,10 @@ class AttachmentUploader < CarrierWave::Uploader::Base
Gitlab.config.gitlab.relative_url_root + "/files/#{model.class.to_s.underscore}/#{model.id}/#{file.filename}"
end
+ def url
+ Gitlab.config.gitlab.relative_url_root + '' + super unless super.nil?
+ end
+
def file_storage?
self.class.storage == CarrierWave::Storage::File
end
--
GitLab