do not search for caller in bundler lib, closes #1614

padrino · Oct 11, 2015 · 8ab29c0 · 8ab29c0
1 parent 0afa4b6
commit 8ab29c0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/CHANGES.rdoc b/CHANGES.rdoc
@@ -2,9 +2,9 @@
 
 == 0.13.0 (October 11th 2015)
 
+- FIX #1614 Do not search for caller in bundler lib (@ujifgc)
 - FIX #1796 Save and restore layout setting (@ujifgc)
 - FIX #1965 Fail properly on wrong mailer name or message (@ujifgc)
-- FIX #1965 Fail properly on wrong mailer name or message (@ujifgc)
 - FIX #1959 simplify the mounter class (@dnesteryuk)
 - FIX #1916 Check key existence on caching (@namusyaka)
 - NEW #1946 Documentation fixes re default renderer is now none (@Quintasan)

diff --git a/padrino-core/lib/padrino-core/caller.rb b/padrino-core/lib/padrino-core/caller.rb
@@ -18,7 +18,8 @@ module Padrino
     %r{rake_test_loader\.rb},
     %r{custom_require\.rb$},
     %r{active_support},
-    %r{/thor}
+    %r{/thor},
+    %r{/lib/bundler},
   ] unless defined?(PADRINO_IGNORE_CALLERS)
 
   ##