diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2009-05-15 16:47:15 +0200 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-05-15 16:47:15 +0200 |
| commit | 59653101b8cef7915cb1fb4ad4b84f49ae0881e5 (patch) | |
| tree | 9dacd7eaa05c7957b14389538a30d7ebf7f7e349 /railties/lib/rails | |
| parent | 26ad104e72e2b758815a043341dd83a1b02e8c7f (diff) | |
| parent | eb021707f53be46140b55a48e5ef03ed0577a45c (diff) | |
| download | rails-59653101b8cef7915cb1fb4ad4b84f49ae0881e5.tar.gz rails-59653101b8cef7915cb1fb4ad4b84f49ae0881e5.tar.bz2 rails-59653101b8cef7915cb1fb4ad4b84f49ae0881e5.zip | |
Merge commit 'mainstream/master'
Conflicts:
actionpack/lib/action_view/helpers/form_helper.rb
Diffstat (limited to 'railties/lib/rails')
| -rw-r--r-- | railties/lib/rails/plugin.rb | 2 | ||||
| -rw-r--r-- | railties/lib/rails/rack/metal.rb | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/railties/lib/rails/plugin.rb b/railties/lib/rails/plugin.rb index 0f924724cd..e66166306a 100644 --- a/railties/lib/rails/plugin.rb +++ b/railties/lib/rails/plugin.rb @@ -1,3 +1,5 @@ +require 'active_support/core_ext/kernel/reporting' + module Rails # The Plugin class should be an object which provides the following methods: # diff --git a/railties/lib/rails/rack/metal.rb b/railties/lib/rails/rack/metal.rb index 7a616c7911..b031be29af 100644 --- a/railties/lib/rails/rack/metal.rb +++ b/railties/lib/rails/rack/metal.rb @@ -1,5 +1,6 @@ require 'active_support/ordered_hash' require 'active_support/core_ext/class/attribute_accessors' +require 'active_support/dependencies' module Rails module Rack @@ -27,7 +28,7 @@ module Rails load_list.map do |requested_metal| if metal = all_metals[requested_metal] - require metal + require_dependency metal requested_metal.constantize end end.compact |