diff options
Diffstat (limited to 'activesupport/lib/active_support/vendor.rb')
| -rw-r--r-- | activesupport/lib/active_support/vendor.rb | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/activesupport/lib/active_support/vendor.rb b/activesupport/lib/active_support/vendor.rb index 633eb2ef08..463610722c 100644 --- a/activesupport/lib/active_support/vendor.rb +++ b/activesupport/lib/active_support/vendor.rb @@ -6,23 +6,18 @@ begin rescue Gem::LoadError $:.unshift "#{File.dirname(__FILE__)}/vendor/builder-2.1.2" end +require 'builder' begin - gem 'xml-simple', '~> 1.0.11' + gem 'memcache-client', '~> 1.5.1' rescue Gem::LoadError - $:.unshift "#{File.dirname(__FILE__)}/vendor/xml-simple-1.0.11" + $:.unshift "#{File.dirname(__FILE__)}/vendor/memcache-client-1.5.1" end begin - gem 'memcache-client', '~> 1.5.0' + gem 'tzinfo', '~> 0.3.12' rescue Gem::LoadError - $:.unshift "#{File.dirname(__FILE__)}/vendor/memcache-client-1.5.0" -end - -begin - gem 'tzinfo', '~> 0.3.11' -rescue Gem::LoadError - $:.unshift "#{File.dirname(__FILE__)}/vendor/tzinfo-0.3.11" + $:.unshift "#{File.dirname(__FILE__)}/vendor/tzinfo-0.3.12" end # TODO I18n gem has not been released yet @@ -31,4 +26,4 @@ end # rescue Gem::LoadError $:.unshift "#{File.dirname(__FILE__)}/vendor/i18n-0.0.1" require 'i18n' -# end
\ No newline at end of file +# end |