diff options
| author | Josh Kalderimis <josh.kalderimis@gmail.com> | 2011-05-21 01:23:17 -0400 |
|---|---|---|
| committer | Josh Kalderimis <josh.kalderimis@gmail.com> | 2011-05-21 01:23:17 -0400 |
| commit | c6595053688d812dd8451570059a1fae0075cbe0 (patch) | |
| tree | ca743673c9a682971624587022850ba940c3d530 /actionpack/lib | |
| parent | 95bd19911a62fe7dbe8e72c08e29902efdcfce85 (diff) | |
| download | rails-c6595053688d812dd8451570059a1fae0075cbe0.tar.gz rails-c6595053688d812dd8451570059a1fae0075cbe0.tar.bz2 rails-c6595053688d812dd8451570059a1fae0075cbe0.zip | |
fixed some ruby 19 warnings, including circular requires and variable name reuse
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_view/helpers/asset_paths.rb | 1 | ||||
| -rw-r--r-- | actionpack/lib/action_view/template/handlers/erb.rb | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/helpers/asset_paths.rb b/actionpack/lib/action_view/helpers/asset_paths.rb index 958f0e0a10..38810eea2e 100644 --- a/actionpack/lib/action_view/helpers/asset_paths.rb +++ b/actionpack/lib/action_view/helpers/asset_paths.rb @@ -1,5 +1,4 @@ require 'active_support/core_ext/file' -require 'action_view/helpers/asset_paths' module ActionView module Helpers diff --git a/actionpack/lib/action_view/template/handlers/erb.rb b/actionpack/lib/action_view/template/handlers/erb.rb index 7e9e4e518a..a1e3fd7768 100644 --- a/actionpack/lib/action_view/template/handlers/erb.rb +++ b/actionpack/lib/action_view/template/handlers/erb.rb @@ -1,5 +1,4 @@ require 'active_support/core_ext/class/attribute_accessors' -require 'action_view/template' require 'action_view/template/handler' require 'erubis' |