diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-05-12 20:49:06 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-05-12 20:49:06 -0700 |
| commit | 4c0fa443fdaf43e8403b6fc29f6f5a939f764edb (patch) | |
| tree | 12dda7132cff5c036a59bfcad81c6ca66c037c48 /activesupport | |
| parent | e81a1a4f07f420bac58d93eef6792051d89c2f4f (diff) | |
| parent | b2de3f729496a223d64f9b55192d1b19bda4fc25 (diff) | |
| download | rails-4c0fa443fdaf43e8403b6fc29f6f5a939f764edb.tar.gz rails-4c0fa443fdaf43e8403b6fc29f6f5a939f764edb.tar.bz2 rails-4c0fa443fdaf43e8403b6fc29f6f5a939f764edb.zip | |
Merge pull request #10584 from alindeman/range-missing-alias-attribute
Fixes NoMethodError: `alias_method_chain` when requiring just active_support/core_ext
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/marshal.rb | 2 | ||||
| -rw-r--r-- | activesupport/lib/active_support/core_ext/range/include_range.rb | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/core_ext/marshal.rb b/activesupport/lib/active_support/core_ext/marshal.rb index c7a8348b1d..56c79c04bd 100644 --- a/activesupport/lib/active_support/core_ext/marshal.rb +++ b/activesupport/lib/active_support/core_ext/marshal.rb @@ -1,3 +1,5 @@ +require 'active_support/core_ext/module/aliasing' + module Marshal class << self def load_with_autoloading(source) diff --git a/activesupport/lib/active_support/core_ext/range/include_range.rb b/activesupport/lib/active_support/core_ext/range/include_range.rb index 3af66aaf2f..3a07401c8a 100644 --- a/activesupport/lib/active_support/core_ext/range/include_range.rb +++ b/activesupport/lib/active_support/core_ext/range/include_range.rb @@ -1,3 +1,5 @@ +require 'active_support/core_ext/module/aliasing' + class Range # Extends the default Range#include? to support range comparisons. # (1..5).include?(1..5) # => true |