1 files changed, 8 insertions, 1 deletions
diff --git a/config/boot.rb b/config/boot.rb
index 0f5e661ed..906a2bace 100644
--- a/config/boot.rb
+++ b/config/boot.rb
@@ -6,7 +6,7 @@
 # better. Look for a config/rails_env file, and read stuff from there if 
 # it exists. Put just a line like this in there:
 #   ENV['RAILS_ENV'] = 'production'
-rails_env_file = File.join(File.dirname(__FILE__), 'rails_env.rb')
+rails_env_file = File.expand_path(File.join(File.dirname(__FILE__), 'rails_env.rb'))
 if File.exists?(rails_env_file)
     require rails_env_file
 end
@@ -46,6 +46,13 @@ module Rails
   class Boot
     def run
       load_initializer
+
+      Rails::Initializer.class_eval do
+        def load_gems
+          @bundler_loaded ||= Bundler.require :default, Rails.env
+        end
+      end
+
       Rails::Initializer.run(:set_load_path)
     end
   end