cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge 12304:14009 from trunk.

Browse source
This commit is contained in:
Tom Hughes 2009-03-08 13:02:37 +00:00
commit c8ee135104
36 changed files with 174 additions and 130 deletions
Download patch file Download diff file Expand all files Collapse all files

2
config/environment.rb
View file

@ -46,7 +46,7 @@ Rails::Initializer.run do |config|
# 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 => '0.9.4', :lib => 'libxml'
config.gem 'libxml-ruby', :version => '>= 1.0.0', :lib => 'libxml'
config.gem 'rmagick', :lib => 'RMagick'
config.gem 'mysql'

6
config/initializers/libxml.rb
View file

@ -1,9 +1,5 @@
# This is required otherwise libxml writes out memory errors to
# the standard output and exits uncleanly
# Changed method due to deprecation of the old register_error_handler
# http://libxml.rubyforge.org/rdoc/classes/LibXML/XML/Parser.html#M000076
# So set_handler is used instead
# http://libxml.rubyforge.org/rdoc/classes/LibXML/XML/Error.html#M000334
# the standard output and exits uncleanly
LibXML::XML::Error.set_handler do |message|
raise message
end