diff options
| author | Arthur Nogueira Neves <github@arthurnn.com> | 2015-10-04 20:46:54 -0400 |
|---|---|---|
| committer | Arthur Nogueira Neves <github@arthurnn.com> | 2015-10-04 20:46:54 -0400 |
| commit | 280c09a210fa03ee002807c3ccecf50eca64df16 (patch) | |
| tree | 042b902578c7d6dc19fb0971269d03df9d9a009e /railties/lib | |
| parent | e202d59816fe3304dbd2774cc8d5bd16e3488be3 (diff) | |
| parent | f96b19b6da582bc99dde3f74aeee6ff68353d7c9 (diff) | |
| download | rails-280c09a210fa03ee002807c3ccecf50eca64df16.tar.gz rails-280c09a210fa03ee002807c3ccecf50eca64df16.tar.bz2 rails-280c09a210fa03ee002807c3ccecf50eca64df16.zip | |
Merge pull request #20986 from radar/rails-engine-caller-locations
Remove check for caller_locations in Rails::Engine
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails/engine.rb | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb index c4bb7d2109..5757d235d2 100644 --- a/railties/lib/rails/engine.rb +++ b/railties/lib/rails/engine.rb @@ -358,12 +358,7 @@ module Rails Rails::Railtie::Configuration.eager_load_namespaces << base base.called_from = begin - call_stack = if Kernel.respond_to?(:caller_locations) - caller_locations.map { |l| l.absolute_path || l.path } - else - # Remove the line number from backtraces making sure we don't leave anything behind - caller.map { |p| p.sub(/:\d+.*/, '') } - end + call_stack = caller_locations.map { |l| l.absolute_path || l.path } File.dirname(call_stack.detect { |p| p !~ %r[railties[\w.-]*/lib/rails|rack[\w.-]*/lib/rack] }) end |