diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-10-15 11:26:58 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-10-15 11:26:58 +0200 |
| commit | 95f0440a7823a927ebba1557b091c12255e49ac4 (patch) | |
| tree | fa6d130f2baff18e7a70d74dafe79e20da35babe /app/uploaders/file_uploader.rb | |
| parent | 4a5b77188ec7525d1c3a1ee925c8791f841b040c (diff) | |
| parent | 123669a55107514798ba531ba3a744b3ec8503ee (diff) | |
| download | gitlab-ce-95f0440a7823a927ebba1557b091c12255e49ac4.tar.gz | |
Merge branch 'master' into rs-redactor-filter
Diffstat (limited to 'app/uploaders/file_uploader.rb')
| -rw-r--r-- | app/uploaders/file_uploader.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/uploaders/file_uploader.rb b/app/uploaders/file_uploader.rb index f9673abbfe8..e8211585834 100644 --- a/app/uploaders/file_uploader.rb +++ b/app/uploaders/file_uploader.rb @@ -26,7 +26,7 @@ class FileUploader < CarrierWave::Uploader::Base end def secure_url - File.join(Gitlab.config.gitlab.url, @project.path_with_namespace, "uploads", @secret, file.filename) + File.join("/uploads", @secret, file.filename) end def file_storage? |