Permalink
Browse files

Do not load RubyGems in environment.rb if it already loaded

  • Loading branch information...
1 parent 9bf2601 commit a69d2941c091137e94ac06347327477befaa6a12 @wilson wilson committed with Carl Lerche Dec 21, 2009
Showing with 1 addition and 1 deletion.
  1. +1 −1 lib/bundler/templates/environment.erb
@@ -26,7 +26,7 @@ module Bundler
@gemfile = "#{dir}/<%= filename %>"
<% if options[:rubygems] -%>
- require "rubygems"
+ require "rubygems" unless respond_to?(:gem) # 1.9 already has RubyGems loaded
@bundled_specs = {}
<% specs.each do |spec| -%>

0 comments on commit a69d294

Please sign in to comment.