aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib
diff options
context:
space:
mode:
authorAndy Lindeman <alindeman@gmail.com>2013-05-12 22:43:48 -0400
committerAndy Lindeman <alindeman@gmail.com>2013-05-12 22:43:48 -0400
commitb2de3f729496a223d64f9b55192d1b19bda4fc25 (patch)
tree3511daa02a594d939edc21f52791c1c5822f160b /activesupport/lib
parent42da93ca303b1547c4e63bfd2245339be0ce0672 (diff)
downloadrails-b2de3f729496a223d64f9b55192d1b19bda4fc25.tar.gz
rails-b2de3f729496a223d64f9b55192d1b19bda4fc25.tar.bz2
rails-b2de3f729496a223d64f9b55192d1b19bda4fc25.zip
Fixes NoMethodError: `alias_method_chain` when requiring just active_support/core_ext
* Each file that uses `alias_method_chain` brings it in explicitly
Diffstat (limited to 'activesupport/lib')
-rw-r--r--activesupport/lib/active_support/core_ext/marshal.rb2
-rw-r--r--activesupport/lib/active_support/core_ext/range/include_range.rb2
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