aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorSergio Gómez <hola@sergio-gomez.com>2018-04-12 09:03:10 +0200
committerSergio Gómez <hola@sergio-gomez.com>2018-04-12 09:30:56 +0200
commitfca1906bc22dae61262b1d76672baa64b1cf5315 (patch)
treee06b214fddaa93ea39f36dd72eaaffddd4a9b0ea /actionpack
parent2a54f9963eae0592f348b37996e3b9eef85b5b63 (diff)
downloadrails-fca1906bc22dae61262b1d76672baa64b1cf5315.tar.gz
rails-fca1906bc22dae61262b1d76672baa64b1cf5315.tar.bz2
rails-fca1906bc22dae61262b1d76672baa64b1cf5315.zip
Remove lock from method model
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_controller/metal/params_wrapper.rb2
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 a678377d4f..9c915425af 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