aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/core.rb
diff options
context:
space:
mode:
authorCarl Lerche <carllerche@mac.com>2009-10-08 18:12:28 -0700
committerCarl Lerche <carllerche@mac.com>2009-10-08 18:12:28 -0700
commit992c2db76cd6cd6aa9a6ba3711a6ea1ad8910062 (patch)
tree83cde462f67aa72eff043e392756ded1ebdf424c /railties/lib/rails/core.rb
parent5c42157cd83b022d05738c6759e38536f74fc572 (diff)
downloadrails-992c2db76cd6cd6aa9a6ba3711a6ea1ad8910062.tar.gz
rails-992c2db76cd6cd6aa9a6ba3711a6ea1ad8910062.tar.bz2
rails-992c2db76cd6cd6aa9a6ba3711a6ea1ad8910062.zip
Finish porting over the initializers to the app object and fix all the tests
Diffstat (limited to 'railties/lib/rails/core.rb')
-rw-r--r--railties/lib/rails/core.rb6
1 files changed, 1 insertions, 5 deletions
diff --git a/railties/lib/rails/core.rb b/railties/lib/rails/core.rb
index 4be90de792..929c38bd22 100644
--- a/railties/lib/rails/core.rb
+++ b/railties/lib/rails/core.rb
@@ -15,11 +15,7 @@ module Rails
# The Configuration instance used to configure the Rails environment
def configuration
- @@configuration
- end
-
- def configuration=(configuration)
- @@configuration = configuration
+ application.configuration
end
def initialized?