From: Tom Hughes <tom@compton.nu>
Date: Thu, 12 Mar 2009 00:13:27 +0000 (+0000)
Subject: Merged 14009:14059 from trunk.
X-Git-Tag: live~7622^2~58
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/bed9cd00ed166ce346da4b8a9b654ddf86e64e70

Merged 14009:14059 from trunk.
---

bed9cd00ed166ce346da4b8a9b654ddf86e64e70
diff --cc config/environment.rb
index b3481c024,e6af619eb..ce1216b83
--- a/config/environment.rb
+++ b/config/environment.rb
@@@ -40,16 -37,6 +40,16 @@@ Rails::Initializer.run do |config
      config.frameworks -= [ :active_record ]
    end
  
 +  # Specify gems that this application depends on. 
 +  # They can then be installed with "rake gems:install" on new installations.
 +  # config.gem "bj"
 +  # config.gem "hpricot", :version => '0.6', :source => "http://code.whytheluckystiff.net"
 +  # config.gem "aws-s3", :lib => "aws/s3"
 +  config.gem 'composite_primary_keys', :version => '1.1.0'
-   config.gem 'libxml-ruby', :version => '>= 1.0.0', :lib => 'libxml'
++  config.gem 'libxml-ruby', :version => '>= 1.1.1', :lib => 'libxml'
 +  config.gem 'rmagick', :lib => 'RMagick'
 +  config.gem 'mysql'
 +
    # Only load the plugins named here, in the order given. By default, all plugins 
    # in vendor/plugins are loaded in alphabetical order.
    # :all can be used as a placeholder for all plugins not explicitly named