From: Shaun McDonald <shaun@shaunmcdonald.me.uk>
Date: Wed, 29 Oct 2008 15:45:48 +0000 (+0000)
Subject: add a comment about why the error handler is required, as per mail from TomH. Also... 
X-Git-Tag: live~7619^2~232
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/b4c46ba4b8796d21c38fe737953808139adae741?ds=sidebyside

add a comment about why the error handler is required, as per mail from TomH. Also adding the option so that we are using the old style of migrations, rather than the 2.1+ migrations.
---

diff --git a/config/environment.rb b/config/environment.rb
index e23f23bfa..171bb6fc8 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -76,6 +76,12 @@ Rails::Initializer.run do |config|
   # (create the session table with 'rake db:sessions:create')
   config.action_controller.session_store = :sql_session_store
 
+  # We will use the old style of migrations, rather than the newer
+  # timestamped migrations that were introduced with Rails 2.1, as
+  # it will be confusing to have the numbered and timestamped migrations
+  # together in the same folder.
+  config.active_record.timestamped_migrations = false
+
   # Use SQL instead of Active Record's schema dumper when creating the test database.
   # This is necessary if your schema can't be completely dumped by the schema dumper,
   # like if you have constraints or database-specific column types
diff --git a/config/initializers/libxml.rb b/config/initializers/libxml.rb
index 4f71b6d0f..3b5919f0f 100644
--- a/config/initializers/libxml.rb
+++ b/config/initializers/libxml.rb
@@ -1,8 +1,5 @@
-#require 'rubygems'
-#gem 'libxml-ruby', '>= 0.8.3'
-#require 'libxml'
-
-# Is this really needed?
+# This is required otherwise libxml writes out memory errors to
+# the standard output and exits uncleanly 
 LibXML::XML::Parser.register_error_handler do |message|
   raise message
 end