Index: activesupport-2.3.5/lib/active_support/vendor.rb =================================================================== --- activesupport-2.3.5.orig/lib/active_support/vendor.rb +++ activesupport-2.3.5/lib/active_support/vendor.rb @@ -1,11 +1,7 @@ # Prefer gems to the bundled libs. require 'rubygems' -begin - gem 'builder', '~> 2.1.2' -rescue Gem::LoadError - $:.unshift "#{File.dirname(__FILE__)}/vendor/builder-2.1.2" -end +gem 'builder', '~> 2.1.2' require 'builder' begin @@ -14,15 +10,7 @@ rescue Gem::LoadError $:.unshift "#{File.dirname(__FILE__)}/vendor/memcache-client-1.7.4" end -begin - gem 'tzinfo', '~> 0.3.12' -rescue Gem::LoadError - $:.unshift "#{File.dirname(__FILE__)}/vendor/tzinfo-0.3.12" -end +gem 'tzinfo', '~> 0.3.12' -begin - gem 'i18n', '>= 0.1.3' -rescue Gem::LoadError - $:.unshift "#{File.dirname(__FILE__)}/vendor/i18n-0.1.3/lib" -end +gem 'i18n', '~> 0.1.3' require 'i18n'