Commit db585009 authored by Marin Jankovski's avatar Marin Jankovski

Revert "Merge pull request #7349 from srna/patch-1"

This reverts commit b37b71d8, reversing
changes made to 42a1d808.
parent 69e8b0e9
...@@ -26,10 +26,6 @@ class AttachmentUploader < CarrierWave::Uploader::Base ...@@ -26,10 +26,6 @@ class AttachmentUploader < CarrierWave::Uploader::Base
Gitlab.config.gitlab.relative_url_root + "/files/#{model.class.to_s.underscore}/#{model.id}/#{file.filename}" Gitlab.config.gitlab.relative_url_root + "/files/#{model.class.to_s.underscore}/#{model.id}/#{file.filename}"
end end
def url
Gitlab.config.gitlab.relative_url_root + super unless super.nil?
end
def file_storage? def file_storage?
self.class.storage == CarrierWave::Storage::File self.class.storage == CarrierWave::Storage::File
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment