diff options
| author | Jeroen Nijhof <jeroen@jeroennijhof.nl> | 2016-01-11 11:32:35 +0300 |
|---|---|---|
| committer | Jeroen Nijhof <jeroen@jeroennijhof.nl> | 2016-01-11 11:32:35 +0300 |
| commit | 706255b926f21588fcb11f08d1a3781c407900cd (patch) | |
| tree | b304932262b48942a6526fdd8464f53212577134 /app/services | |
| parent | e0436005af0d567391031ebbf546877f7f525731 (diff) | |
| parent | f394ccd584f7c2a58a172ad4dd501045cb388e9c (diff) | |
Merge gitlab.com:gitlab-org/gitlab-ce
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/projects/download_service.rb | 8 | ||||
| -rw-r--r-- | app/services/projects/upload_service.rb | 8 |
2 files changed, 2 insertions, 14 deletions
diff --git a/app/services/projects/download_service.rb b/app/services/projects/download_service.rb index 99f22293d0d..6386f57fb0d 100644 --- a/app/services/projects/download_service.rb +++ b/app/services/projects/download_service.rb @@ -16,13 +16,7 @@ module Projects uploader.download!(@url) uploader.store! - filename = uploader.image? ? uploader.file.basename : uploader.file.filename - - { - 'alt' => filename, - 'url' => uploader.secure_url, - 'is_image' => uploader.image? - } + uploader.to_h end private diff --git a/app/services/projects/upload_service.rb b/app/services/projects/upload_service.rb index 279550d6f4a..012e82a7704 100644 --- a/app/services/projects/upload_service.rb +++ b/app/services/projects/upload_service.rb @@ -10,13 +10,7 @@ module Projects uploader = FileUploader.new(@project) uploader.store!(@file) - filename = uploader.image? ? uploader.file.basename : uploader.file.filename - - { - alt: filename, - url: uploader.secure_url, - is_image: uploader.image? - } + uploader.to_h end private |