diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2008-10-21 14:29:41 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2008-10-21 14:29:41 +0100 |
| commit | fa09de351c8045c7e7a0f268188ccf80c827b079 (patch) | |
| tree | 529922eaddfb5575d026f214bb84b9cd5a022d23 /activesupport/lib/active_support.rb | |
| parent | d2f3bddaebc0d52fd4df1392c87c84333612c531 (diff) | |
| parent | a5cdb7a813515fa0cbee23101d2f911b4017ed90 (diff) | |
| download | rails-fa09de351c8045c7e7a0f268188ccf80c827b079.tar.gz rails-fa09de351c8045c7e7a0f268188ccf80c827b079.tar.bz2 rails-fa09de351c8045c7e7a0f268188ccf80c827b079.zip | |
Merge commit 'mainstream/master'
Diffstat (limited to 'activesupport/lib/active_support.rb')
| -rw-r--r-- | activesupport/lib/active_support.rb | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/activesupport/lib/active_support.rb b/activesupport/lib/active_support.rb index 0ff09067ec..202f4ce6ab 100644 --- a/activesupport/lib/active_support.rb +++ b/activesupport/lib/active_support.rb @@ -59,7 +59,3 @@ require 'active_support/secure_random' require 'active_support/rescuable' I18n.load_path << File.dirname(__FILE__) + '/active_support/locale/en-US.yml' - -Inflector = ActiveSupport::Deprecation::DeprecatedConstantProxy.new('Inflector', 'ActiveSupport::Inflector') -Dependencies = ActiveSupport::Deprecation::DeprecatedConstantProxy.new('Dependencies', 'ActiveSupport::Dependencies') -TimeZone = ActiveSupport::Deprecation::DeprecatedConstantProxy.new('TimeZone', 'ActiveSupport::TimeZone') |