summaryrefslogtreecommitdiff
path: root/app/uploaders
diff options
context:
space:
mode:
authorMarin Jankovski <maxlazio@gmail.com>2014-12-05 15:33:22 +0100
committerMarin Jankovski <maxlazio@gmail.com>2014-12-05 15:33:22 +0100
commitdb585009be76ed7b00b4298f863333c92b94cf04 (patch)
treea7aa783ddaf8485783f8e309a2ea3268f2bfd72d /app/uploaders
parent69e8b0e9fd03bf745556d7382c1156073998a0d6 (diff)
downloadgitlab-ce-db585009be76ed7b00b4298f863333c92b94cf04.tar.gz
Revert "Merge pull request #7349 from srna/patch-1"
This reverts commit b37b71d887e8521b8992aa6e4f789a38b393e55a, reversing changes made to 42a1d8083c77d3803320bbbd0ac1559ff32d2519.
Diffstat (limited to 'app/uploaders')
-rw-r--r--app/uploaders/attachment_uploader.rb4
1 files changed, 0 insertions, 4 deletions
diff --git a/app/uploaders/attachment_uploader.rb b/app/uploaders/attachment_uploader.rb
index 29a55b36ca5..b122b6c8658 100644
--- a/app/uploaders/attachment_uploader.rb
+++ b/app/uploaders/attachment_uploader.rb
@@ -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}"
end
- def url
- Gitlab.config.gitlab.relative_url_root + super unless super.nil?
- end
-
def file_storage?
self.class.storage == CarrierWave::Storage::File
end