diff options
author | Douwe Maan <douwe@gitlab.com> | 2015-10-15 11:47:36 +0200 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2015-10-15 11:47:36 +0200 |
commit | c993481d991333fe0750080eec98fd2e9eeda8d5 (patch) | |
tree | 7d1fdd7926f8542b7fbf7add052004dbfd48b206 /app/uploaders/file_uploader.rb | |
parent | 83f04853e9a749c3397ee7683a78b986e1070904 (diff) | |
parent | 123669a55107514798ba531ba3a744b3ec8503ee (diff) | |
download | gitlab-ce-c993481d991333fe0750080eec98fd2e9eeda8d5.tar.gz |
Merge branch 'master' into git-archive-golanggit-archive-golang
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? |