diff options
| author | José Valim <jose.valim@gmail.com> | 2009-11-24 09:24:40 -0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2009-11-24 09:24:40 -0200 |
| commit | 41e607dee20b15d8dc71dc16a08d4bbe9e36ac70 (patch) | |
| tree | a99108c3e60bb9f44f5f1870d885971de383b9e4 /railties/lib/rails/configuration.rb | |
| parent | 16cf25e717c9b13e402fda33fe859684e1d8a154 (diff) | |
| parent | e62e6d409986cd5c99234689aa49e3162d7b3a59 (diff) | |
| download | rails-41e607dee20b15d8dc71dc16a08d4bbe9e36ac70.tar.gz rails-41e607dee20b15d8dc71dc16a08d4bbe9e36ac70.tar.bz2 rails-41e607dee20b15d8dc71dc16a08d4bbe9e36ac70.zip | |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'railties/lib/rails/configuration.rb')
| -rw-r--r-- | railties/lib/rails/configuration.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/configuration.rb b/railties/lib/rails/configuration.rb index 102a0836dc..3f43a48e2e 100644 --- a/railties/lib/rails/configuration.rb +++ b/railties/lib/rails/configuration.rb @@ -31,7 +31,7 @@ module Rails def root @root ||= begin call_stack = caller.map { |p| p.split(':').first } - root_path = call_stack.detect { |p| p !~ %r[railties/lib/rails] } + root_path = call_stack.detect { |p| p !~ %r[railties/lib/rails|rack/lib/rack] } root_path = File.dirname(root_path) while root_path && File.directory?(root_path) && !File.exist?("#{root_path}/config.ru") |