diff options
| author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2013-01-01 20:56:35 -0800 |
|---|---|---|
| committer | Guillermo Iguaran <guilleiguaran@gmail.com> | 2013-01-01 20:56:35 -0800 |
| commit | e443ac03a45e9444a688fcf840edd06aa361e9b0 (patch) | |
| tree | 92c007990449f313c624a9354334ee41a49292fc /activesupport | |
| parent | bb38df89bfbfc37913babe2edf6ad73b0dc80358 (diff) | |
| parent | 7bc224dda00133dcb72c531d3b46391a88f21062 (diff) | |
| download | rails-e443ac03a45e9444a688fcf840edd06aa361e9b0.tar.gz rails-e443ac03a45e9444a688fcf840edd06aa361e9b0.tar.bz2 rails-e443ac03a45e9444a688fcf840edd06aa361e9b0.zip | |
Merge pull request #8682 from amatsuda/rm_as_frozen_object_error
remove meaningless AS::FrozenObjectError
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/cache.rb | 1 | ||||
| -rw-r--r-- | activesupport/lib/active_support/core_ext/exception.rb | 3 |
2 files changed, 0 insertions, 4 deletions
diff --git a/activesupport/lib/active_support/cache.rb b/activesupport/lib/active_support/cache.rb index fdec2de1d5..5a5548d567 100644 --- a/activesupport/lib/active_support/cache.rb +++ b/activesupport/lib/active_support/cache.rb @@ -3,7 +3,6 @@ require 'zlib' require 'active_support/core_ext/array/extract_options' require 'active_support/core_ext/array/wrap' require 'active_support/core_ext/benchmark' -require 'active_support/core_ext/exception' require 'active_support/core_ext/class/attribute_accessors' require 'active_support/core_ext/numeric/bytes' require 'active_support/core_ext/numeric/time' diff --git a/activesupport/lib/active_support/core_ext/exception.rb b/activesupport/lib/active_support/core_ext/exception.rb deleted file mode 100644 index ba7757ea07..0000000000 --- a/activesupport/lib/active_support/core_ext/exception.rb +++ /dev/null @@ -1,3 +0,0 @@ -module ActiveSupport - FrozenObjectError = RuntimeError -end |