aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/application.rb
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-03-08 21:06:26 +0100
committerJosé Valim <jose.valim@gmail.com>2010-03-08 21:06:26 +0100
commit7942e909608f24db0365943c5d9ad51cbb4d27b5 (patch)
tree6a9b51155b9220dbf98d4b1c78d8edccabd231c5 /railties/lib/rails/application.rb
parent36eb1a686c831d5a14998bb9ac7cc60efa363373 (diff)
parentae93789d9ad9095ca21784287464b760db12a095 (diff)
downloadrails-7942e909608f24db0365943c5d9ad51cbb4d27b5.tar.gz
rails-7942e909608f24db0365943c5d9ad51cbb4d27b5.tar.bz2
rails-7942e909608f24db0365943c5d9ad51cbb4d27b5.zip
Merge master.
Diffstat (limited to 'railties/lib/rails/application.rb')
-rw-r--r--railties/lib/rails/application.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index d9089b18f0..f43e8847ac 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -15,7 +15,10 @@ module Rails
class << self
private :new
- alias :configure :class_eval
+
+ def configure(&block)
+ class_eval(&block)
+ end
def instance
if self == Rails::Application