X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/252c2f70225595312151bcf77ee7c8f5aac0c831..771a4e5be3f947e84f89939bb9c4c1341f9164a0:/config/environment.rb

diff --git a/config/environment.rb b/config/environment.rb
index e23f23bfa..d2ab58ce4 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -45,7 +45,7 @@ Rails::Initializer.run do |config|
   # 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.0.10'
+  config.gem 'composite_primary_keys', :version => '1.1.0'
   config.gem 'libxml-ruby', :version => '>= 0.8.3', :lib => 'libxml'
   config.gem 'rmagick', :lib => 'RMagick'
   config.gem 'mysql'
@@ -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