diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-04-03 17:13:24 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-04-03 17:13:24 -0300 |
| commit | ae110ce5d4de8cb3a22f826b0e824f333d2b2742 (patch) | |
| tree | 41065be39c3ba3df5d7a02740f105911978f24db /activesupport | |
| parent | 6da3e9ad5bf38ea54135424f360df49495c07afe (diff) | |
| parent | db5d26c9d70fb72b8aa3ea98709224dd13800024 (diff) | |
| download | rails-ae110ce5d4de8cb3a22f826b0e824f333d2b2742.tar.gz rails-ae110ce5d4de8cb3a22f826b0e824f333d2b2742.tar.bz2 rails-ae110ce5d4de8cb3a22f826b0e824f333d2b2742.zip | |
Merge pull request #14572 from laurocaetano/with_options_and_scope
Fix error when using `with_options` with lambda.
Conflicts:
activerecord/CHANGELOG.md
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/option_merger.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/option_merger.rb b/activesupport/lib/active_support/option_merger.rb index e55ffd12c3..dea84e437f 100644 --- a/activesupport/lib/active_support/option_merger.rb +++ b/activesupport/lib/active_support/option_merger.rb @@ -12,7 +12,7 @@ module ActiveSupport private def method_missing(method, *arguments, &block) - if arguments.last.is_a?(Proc) + if arguments.first.is_a?(Proc) proc = arguments.pop arguments << lambda { |*args| @options.deep_merge(proc.call(*args)) } else |