aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
diff options
context:
space:
mode:
authorEmilio Tagua <miloops@gmail.com>2009-05-19 19:37:36 -0300
committerEmilio Tagua <miloops@gmail.com>2009-05-19 19:37:36 -0300
commitaa5512299041efb923cd582fd26009a72b9ec670 (patch)
tree4ba3cd70b4988293b99a89b72f0dbb177426a9f0 /railties/lib/rails
parent1cc44599397e061901cd59233397129625839a60 (diff)
parentd8fffe7b23acce42bc3941d7bba47e07a66aed67 (diff)
downloadrails-aa5512299041efb923cd582fd26009a72b9ec670.tar.gz
rails-aa5512299041efb923cd582fd26009a72b9ec670.tar.bz2
rails-aa5512299041efb923cd582fd26009a72b9ec670.zip
Merge commit 'rails/master'
Diffstat (limited to 'railties/lib/rails')
-rw-r--r--railties/lib/rails/plugin.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/railties/lib/rails/plugin.rb b/railties/lib/rails/plugin.rb
index e66166306a..49ec5c7fba 100644
--- a/railties/lib/rails/plugin.rb
+++ b/railties/lib/rails/plugin.rb
@@ -1,5 +1,3 @@
-require 'active_support/core_ext/kernel/reporting'
-
module Rails
# The Plugin class should be an object which provides the following methods:
#
@@ -141,6 +139,7 @@ module Rails
def evaluate_init_rb(initializer)
if has_init_file?
+ require 'active_support/core_ext/kernel/reporting'
silence_warnings do
# Allow plugins to reference the current configuration object
config = initializer.configuration