diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-01-05 18:40:35 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-01-05 18:40:35 +0000 |
| commit | 8181f58d4407ee273cdf5792aa810d2b008f63d6 (patch) | |
| tree | feb96cdecf106abc4d0272641577191393360cf1 /config | |
| parent | e4da8b11a2222a4ef12025e08b250a5c78dfa2c9 (diff) | |
| parent | cd85baf5e363847ee1cca2e154e5fb47484e0fdf (diff) | |
| download | gitlab-ce-8181f58d4407ee273cdf5792aa810d2b008f63d6.tar.gz | |
Merge branch 'master' into auto-pipelines-vue
* master: (35 commits)
Adds back removed class in merge request pipelines table
Fix dropdown icon alignment
Simplify HTML of mini pipeline graph and dropdown Creates individual html for dropdown Adds simplified CSS for the new dropdown Removes old CSS Improves dropdown item in Chrome, Firefox and Safari Use SCSS variables for colors. Fix scss linter errors Adds animation when the stage is hovered. Adds back tooltip on dropdown toggle Fixes broken tests additional css changes to get more into direction of mockups
Adds CHANGELOG entry
Removes unneeded `window` declaration
Decreases font-size on login page
Ensure internal Gitlab::Git references use the namespace
Absorb gitlab_git
Fix review comments.
Add spec for note edit and fix one commented spec.
Review fixes.
Use gl.utils.isInViewport and improve gl.utils.animateToElement.
Make sure elements share the same scope
Hide edit warning element when form reverted.
Remove unnecessary styling came from merge conflicts.
Fix single note edit form specs.
Separate edit form in Changes and Discussions tab.
Fix warning styling for responsive design.
Fix task list for single edit note widget changes.
Fix notes spec.
...
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/workhorse_multipart.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/config/initializers/workhorse_multipart.rb b/config/initializers/workhorse_multipart.rb index 8de7140e3d4..84d809741c4 100644 --- a/config/initializers/workhorse_multipart.rb +++ b/config/initializers/workhorse_multipart.rb @@ -2,6 +2,12 @@ Rails.application.configure do |config| config.middleware.use(Gitlab::Middleware::Multipart) end +# The Gitlab::Middleware::Multipart middleware inserts instances of our +# own ::UploadedFile class in the Rack env of requests. These instances +# will be blocked by the 'strong parameters' feature of ActionController +# unless we somehow whitelist them. At the moment it seems the only way +# to do that is by monkey-patching. +# module Gitlab module StrongParameterScalars GITLAB_PERMITTED_SCALAR_TYPES = [::UploadedFile] |