diff options
| author | Matthew Draper <matthew@trebex.net> | 2019-04-12 18:22:12 +0930 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-12 18:22:12 +0930 |
| commit | 3bd534287139549cee10e10364344d66139d9237 (patch) | |
| tree | 6ad5ef3f256b0c14e635cc34d0ca1750cca9d0b4 /actionpack/lib/action_controller | |
| parent | e0a0a8fc4406198bc4435b0363729d1cde4e4a7d (diff) | |
| parent | fca1906bc22dae61262b1d76672baa64b1cf5315 (diff) | |
| download | rails-3bd534287139549cee10e10364344d66139d9237.tar.gz rails-3bd534287139549cee10e10364344d66139d9237.tar.bz2 rails-3bd534287139549cee10e10364344d66139d9237.zip | |
Merge pull request #32541 from sergiogomez/remove-lock-from-params-wrapper
Remove lock from method model
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/metal/params_wrapper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/params_wrapper.rb b/actionpack/lib/action_controller/metal/params_wrapper.rb index 09716f7588..e635abec8e 100644 --- a/actionpack/lib/action_controller/metal/params_wrapper.rb +++ b/actionpack/lib/action_controller/metal/params_wrapper.rb @@ -93,7 +93,7 @@ module ActionController end def model - super || synchronize { super || self.model = _default_wrap_model } + super || self.model = _default_wrap_model end def include |