diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2009-07-30 14:18:53 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-07-30 14:18:53 +0100 |
| commit | 915cf5747a78f28f2b25c48574031db60c3a18ae (patch) | |
| tree | 048746387ddaaed418670c86451856675b8d369f /railties/test/boot_test.rb | |
| parent | 23f5e7e966defaaa1511eca57bd8de47f95cb7d9 (diff) | |
| parent | d83b1828577c268de56e1b3942e16002c9efdd57 (diff) | |
| download | rails-915cf5747a78f28f2b25c48574031db60c3a18ae.tar.gz rails-915cf5747a78f28f2b25c48574031db60c3a18ae.tar.bz2 rails-915cf5747a78f28f2b25c48574031db60c3a18ae.zip | |
Merge commit 'mainstream/master'
Conflicts:
railties/guides/source/active_support_overview.textile
Diffstat (limited to 'railties/test/boot_test.rb')
| -rw-r--r-- | railties/test/boot_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/test/boot_test.rb b/railties/test/boot_test.rb index 2dd68857c3..7bf420d4f2 100644 --- a/railties/test/boot_test.rb +++ b/railties/test/boot_test.rb @@ -1,6 +1,6 @@ require 'abstract_unit' require 'initializer' -require "#{File.dirname(__FILE__)}/../environments/boot" +require "#{File.dirname(__FILE__)}/../lib/generators/rails/app/templates/config/boot" require 'rails/gem_dependency' class BootTest < Test::Unit::TestCase |