Go back to rails 2.0.2 for now as 2.1.0 doesn't quite work...

diff --git a/config/environment.rb b/config/environment.rb
index 87ac38982155ecfa593efd061229e76d42e1e84f..cfabe365f4ce7aafea69bb93e563a54ab7396540 100644 (file)
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -5,7 +5,7 @@
 ENV['RAILS_ENV'] ||= 'production'
 
 # Specifies gem version of Rails to use when vendor/rails is not present
-RAILS_GEM_VERSION = '2.1.0' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.0.2' unless defined? RAILS_GEM_VERSION
 
 # Set the server URL
 SERVER_URL = ENV['OSM_SERVER_URL'] || 'www.openstreetmap.org'

diff --git a/config/initializers/composite_primary_keys.rb b/config/initializers/composite_primary_keys.rb
index 8fc93577889287d385596897c027c9bd608c8168..017408e9ee09b9849f794e9c4d98cff169be5939 100644 (file)
--- a/config/initializers/composite_primary_keys.rb
+++ b/config/initializers/composite_primary_keys.rb
@@ -1 +1,2 @@
-require 'composite_primary_keys'
+require 'rubygems'
+gem 'composite_primary_keys', '= 0.9.93'