diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-08-22 13:57:33 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-08-22 13:57:33 +0000 |
| commit | 8654b771588fff719aa313cd115b0c6fa4ab36f3 (patch) | |
| tree | 284f4a05ddb4fc4c8354a659eebc9d39673cfcba /config | |
| parent | ce89c425fe51d2317322350bbd8a364c08d97d21 (diff) | |
| parent | 539dee96739f1dd8925bd890ec2f9549775a949a (diff) | |
| download | gitlab-ce-8654b771588fff719aa313cd115b0c6fa4ab36f3.tar.gz | |
Merge branch 'zj-fix-import-gitlab-export-form' into 'master'
Update form to properly set the path
Closes #36519
See merge request !13722
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/workhorse_multipart.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/config/initializers/workhorse_multipart.rb b/config/initializers/workhorse_multipart.rb index 064e5964f09..4196e3a8f61 100644 --- a/config/initializers/workhorse_multipart.rb +++ b/config/initializers/workhorse_multipart.rb @@ -10,10 +10,8 @@ end # module Gitlab module StrongParameterScalars - GITLAB_PERMITTED_SCALAR_TYPES = [::UploadedFile].freeze - def permitted_scalar?(value) - super || GITLAB_PERMITTED_SCALAR_TYPES.any? { |type| value.is_a?(type) } + super || value.is_a?(::UploadedFile) end end end |