diff options
| author | José Valim <jose.valim@gmail.com> | 2011-05-20 22:24:49 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-05-20 22:24:49 -0700 |
| commit | e4bcd5e7eb21905f66a2eec06cab874a312b787a (patch) | |
| tree | a2e445457682a54f595c2f33afc28bd5a0074383 /actionpack | |
| parent | fa3f273173b83b604cc37016d1f2b3b17ce26b22 (diff) | |
| parent | c6595053688d812dd8451570059a1fae0075cbe0 (diff) | |
| download | rails-e4bcd5e7eb21905f66a2eec06cab874a312b787a.tar.gz rails-e4bcd5e7eb21905f66a2eec06cab874a312b787a.tar.bz2 rails-e4bcd5e7eb21905f66a2eec06cab874a312b787a.zip | |
Merge pull request #1177 from joshk/ruby19_warnings
Fixed some ruby 19 warnings
Diffstat (limited to 'actionpack')
| -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' |