diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-09-05 18:00:11 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-09-05 18:00:11 +0000 |
| commit | d9f05f87ee01d99109505a2b90527d4712f57ee3 (patch) | |
| tree | 9f7ce67e014013a113c4efcb7c4520946fd6d336 | |
| parent | c7eeb7b15dad9177dd6ed0d3fffdeaa2041975ad (diff) | |
| parent | 647db3239699983f06a69df8becd91656b5cb27e (diff) | |
| download | gitlab-ce-d9f05f87ee01d99109505a2b90527d4712f57ee3.tar.gz | |
Merge branch 'an/fix-multipart-error-on-rails-reload' into 'master'
Fix multipart error on rails reload
See merge request gitlab-org/gitlab-ce!21540
| -rw-r--r-- | lib/gitlab/middleware/multipart.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/middleware/multipart.rb b/lib/gitlab/middleware/multipart.rb index 3d588918adf..10cb1e7127e 100644 --- a/lib/gitlab/middleware/multipart.rb +++ b/lib/gitlab/middleware/multipart.rb @@ -83,7 +83,7 @@ module Gitlab def open_file(params, key) allowed_paths = [ - FileUploader.root, + ::FileUploader.root, Gitlab.config.uploads.storage_path, File.join(Rails.root, 'public/uploads/tmp') ] |