Merge pull request sinatra#1061 from BenMorganIO/rack-2-support

kytrinyx · kytrinyx · commit 555d476bf110 · 2015-12-31T13:03:48.000-07:00
Rack 2 Support
diff --git a/lib/sinatra/show_exceptions.rb b/lib/sinatra/show_exceptions.rb
@@ -1,4 +1,8 @@
-require 'rack/showexceptions'
+begin
+  require 'rack/show_exceptions'
+rescue LoadError
+  require 'rack/showexceptions'
+end
 
 module Sinatra
   # Sinatra::ShowExceptions catches all exceptions raised from the app it
