diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2010-02-27 16:59:18 -0800 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2010-02-27 16:59:18 -0800 |
| commit | 6189480b1878cdadb092fdfa32ba156a91e6a0e1 (patch) | |
| tree | 46f9050ceea6c257a0253dff42920aa63a89d0fd /railties/lib | |
| parent | 09cb0977d47c7f5fe0797645a011f43b01121bd3 (diff) | |
| download | rails-6189480b1878cdadb092fdfa32ba156a91e6a0e1.tar.gz rails-6189480b1878cdadb092fdfa32ba156a91e6a0e1.tar.bz2 rails-6189480b1878cdadb092fdfa32ba156a91e6a0e1.zip | |
Revert "Application detection should also allow dots in the path."
Ruby 1.9 regression.
This reverts commit 76237f163ff7ad2a64af926030e3449c547cafa2.
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails/engine.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb index b6ac48768d..a259edc826 100644 --- a/railties/lib/rails/engine.rb +++ b/railties/lib/rails/engine.rb @@ -17,7 +17,7 @@ module Rails base.called_from = begin # Remove the line number from backtraces making sure we don't leave anything behind call_stack = caller.map { |p| p.split(':')[0..-2].join(':') } - File.dirname(call_stack.detect { |p| p !~ %r[railties[\w\-\.]*/lib/rails|rack[\w\-\.]*/lib/rack] }) + File.dirname(call_stack.detect { |p| p !~ %r[railties[\w\-]*/lib/rails|rack[\w\-]*/lib/rack] }) end end |