Merge pull request #7349 from srna/patch-1

Attachment URL with non-/ relative root
2014-11-05 13:11:51 +02:00 · 2014-11-05 13:11:51 +02:00 · b37b71d887
parent 42a1d8083c 733012cb65
commit b37b71d887
1 changed files with 4 additions and 0 deletions
--- 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