diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2009-10-10 17:15:11 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-10-10 17:15:11 +0100 |
| commit | 66ee2654ff243f03595a402fa15e1eea1b5b45be (patch) | |
| tree | 3f1055e03082f0c767719e8cba5155e4207779e0 /railties/lib/rails/core.rb | |
| parent | dd2779e1b83b4d867d47dd286ec0c919f5df12a9 (diff) | |
| parent | b9ce8216fa849a47ad0b0f99fa510e226a23c12e (diff) | |
| download | rails-66ee2654ff243f03595a402fa15e1eea1b5b45be.tar.gz rails-66ee2654ff243f03595a402fa15e1eea1b5b45be.tar.bz2 rails-66ee2654ff243f03595a402fa15e1eea1b5b45be.zip | |
Merge commit 'mainstream/master'
Diffstat (limited to 'railties/lib/rails/core.rb')
| -rw-r--r-- | railties/lib/rails/core.rb | 6 |
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? |