(no commit message)

diff --git a/config/database.yml b/config/database.yml
index 5d59ed74b2cf2150c2be3a5622f57f3a4d47d54a..b884f3b938fea8c5ea541e0d4af5fbbc16529dd7 100644 (file)
--- a/config/database.yml
+++ b/config/database.yml
@@ -24,7 +24,7 @@ test:
   adapter: mysql
   database: osm_test
   username: root
   adapter: mysql
   database: osm_test
   username: root

-  password: root
+  password:

   host: localhost
 
 production:
   host: localhost
 
 production:

diff --git a/config/environments/development.rb b/config/environments/development.rb
index 7a7876f28105ba3c637da58e8dd4dd3c50169c00..09a451f9a336aa17352c3421db1cc593c593155d 100644 (file)
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -15,6 +15,4 @@ config.action_controller.perform_caching             = false
 config.action_view.cache_template_extensions         = false
 
 # Don't care if the mailer can't send
 config.action_view.cache_template_extensions         = false
 
 # Don't care if the mailer can't send

-config.action_mailer.raise_delivery_errors = false
-
-ENV['RAILS_ASSET_ID'] = '' # http://wiki.openstreetmap.org/wiki/The_Rails_Port
\ No newline at end of file
+config.action_mailer.raise_delivery_errors = false
\ No newline at end of file

diff --git a/config/initializers/libxml.rb b/config/initializers/libxml.rb
index 22f429da53bdaf89f866c01cdb95f78cd0142d9c..a1870dbab8b4aaaacfe5e5169bcb40e622f3dc11 100644 (file)
--- a/config/initializers/libxml.rb
+++ b/config/initializers/libxml.rb
@@ -2,4 +2,6 @@ require 'rubygems'
 gem 'libxml-ruby', '>= 0.8.3'
 require 'libxml'
 
 gem 'libxml-ruby', '>= 0.8.3'
 require 'libxml'
 

-LibXML::XML::Parser.register_error_handler(proc{})
+LibXML::XML::Parser.register_error_handler do |message|
+  raise message
+end