X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/721dd9c27d299455b9159457a095716f797389f1..7253c38234f44d65f8d70f8fcad36e0035e841e4:/config/environment.rb?ds=inline diff --git a/config/environment.rb b/config/environment.rb index ffed548bd..f105d5a7e 100644 --- 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.2' unless defined? RAILS_GEM_VERSION +RAILS_GEM_VERSION = '2.3.2' unless defined? RAILS_GEM_VERSION # 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 +# :database_readonly - database and site in read-only mode # :database_offline - database offline with site in emergency mode # OSM_STATUS = :online @@ -45,10 +46,10 @@ 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.1.0' - config.gem 'libxml-ruby', :version => '0.9.4', :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 'mysql' + config.gem 'oauth', :version => '0.3.5' # Only load the plugins named here, in the order given. By default, all plugins # in vendor/plugins are loaded in alphabetical order.