From db585009be76ed7b00b4298f863333c92b94cf04 Mon Sep 17 00:00:00 2001 From: Marin Jankovski Date: Fri, 5 Dec 2014 15:33:22 +0100 Subject: Revert "Merge pull request #7349 from srna/patch-1" This reverts commit b37b71d887e8521b8992aa6e4f789a38b393e55a, reversing changes made to 42a1d8083c77d3803320bbbd0ac1559ff32d2519. --- app/uploaders/attachment_uploader.rb | 4 ---- 1 file changed, 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 -- cgit v1.2.1