Merged sections in en.yml

[rails.git] / config / environment.rb

diff --git a/config/environment.rb b/config/environment.rb
index 171bb6fc8e5d4b688cad375ac39574e953669259..8f38f28bed186c1a9acd23617d96b4a59c98cc9b 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
 ENV['RAILS_ENV'] ||= 'production'
 
 # Specifies gem version of Rails to use when vendor/rails is not present

-RAILS_GEM_VERSION = '2.1.2' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.2.2' unless defined? RAILS_GEM_VERSION

 
 # Set the server URL
 SERVER_URL = ENV['OSM_SERVER_URL'] || 'www.openstreetmap.org'
 
 # Set the server URL
 SERVER_URL = ENV['OSM_SERVER_URL'] || 'www.openstreetmap.org'


@@ -21,6 +21,7 @@ API_VERSION = ENV['OSM_API_VERSION'] || '0.6'
 #   :online - online and operating normally
 #   :api_readonly - site online but API in read-only mode
 #   :api_offline - site online but API offline
 #   :online - online and operating normally
 #   :api_readonly - site online but API in read-only mode
 #   :api_offline - site online but API offline

+#   :database_readonly - database and site in read-only mode

 #   :database_offline - database offline with site in emergency mode
 #
 OSM_STATUS = :online
 #   :database_offline - database offline with site in emergency mode
 #
 OSM_STATUS = :online


@@ -45,10 +46,9 @@ 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 "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 'libxml-ruby', :version => '>= 0.8.3', :lib => 'libxml'
+  config.gem 'composite_primary_keys', :version => '2.2.2'
+  config.gem 'libxml-ruby', :version => '>= 1.1.1', :lib => 'libxml'

   config.gem 'rmagick', :lib => 'RMagick'
   config.gem 'rmagick', :lib => 'RMagick'

-  config.gem 'mysql'

 
   # Only load the plugins named here, in the order given. By default, all plugins 
   # in vendor/plugins are loaded in alphabetical order.
 
   # Only load the plugins named here, in the order given. By default, all plugins 
   # in vendor/plugins are loaded in alphabetical order.


@@ -91,5 +91,5 @@ Rails::Initializer.run do |config|
   # config.active_record.observers = :cacher, :garbage_collector
 
   # Make Active Record use UTC-base instead of local time
   # config.active_record.observers = :cacher, :garbage_collector
 
   # Make Active Record use UTC-base instead of local time

-  # config.active_record.default_timezone = :utc
+  config.active_record.default_timezone = :utc

 end
 end