From 0c08b2f18dab8647a0d318ecc2d93600081cfba6 Mon Sep 17 00:00:00 2001
From: Simone Carletti <weppos@weppos.net>
Date: Thu, 7 Apr 2011 14:16:46 +0200
Subject: [PATCH] Recent releases of Bundler makes even more simple to load
 Bundler.

No need to take care of caching or pre-cached bundles anymore.
---
 config.ru | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/config.ru b/config.ru
index 4cb97e44..6f50d587 100644
--- a/config.ru
+++ b/config.ru
@@ -1,15 +1,8 @@
 
 # bundler
 
-begin
-  # try to require the preresolved locked set of gems.
-  require ::File.expand_path('.bundle/environment', __FILE__)
-rescue LoadError
-  # fall back on doing an unlocked resolve at runtime.
-  require 'rubygems'
-  require 'bundler'
-  Bundler.setup(:default)
-end
+require 'rubygems'
+require 'bundler/setup'
 
 
 # json