kotovalexarian-likes-github
/
sinatra
mirror of https://github.com/sinatra/sinatra
1
0
Fork 0
Code Releases Activity

Merge branch 'master' of github.com:sinatra/sinatra

This commit is contained in:
Konstantin Haase 2011-06-16 11:11:23 +02:00
parent 1f6d9d52a7 1aaa9fb5ef
commit 16b02beb68
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/sinatra/base.rb
View File

@ -1287,7 +1287,8 @@ module Sinatra
/rubygems\/custom_require\.rb$/, # rubygems require hacks
/active_support/, # active_support require hacks
/bundler(\/runtime)?\.rb/, # bundler require hacks
/<internal:/ # internal in ruby >= 1.9.2
/<internal:/, # internal in ruby >= 1.9.2
/src\/kernel\/bootstrap\/[A-Z]/ # maglev kernel files
]
# add rubinius (and hopefully other VM impls) ignore patterns ...
@ -1304,7 +1305,7 @@ module Sinatra
def caller_locations
cleaned_caller 2
end
private
# used for deprecation warnings
def warn(message)