X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/c08f9a2f0343a4c9ca2543737c8cb8747d816e02..67a50468c55f4a805c1eae001a13da10157976e0:/config/environment.rb diff --git a/config/environment.rb b/config/environment.rb index 7e550ca9f..ef62230c5 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -1,7 +1,7 @@ # Be sure to restart your server when you modify this file # Specifies gem version of Rails to use when vendor/rails is not present -RAILS_GEM_VERSION = '2.3.8' unless defined? RAILS_GEM_VERSION +RAILS_GEM_VERSION = '2.3.11' unless defined? RAILS_GEM_VERSION # Bootstrap the Rails environment, frameworks, and default configuration require File.join(File.dirname(__FILE__), 'boot') @@ -18,14 +18,17 @@ Rails::Initializer.run do |config| unless STATUS == :database_offline config.gem 'composite_primary_keys', :version => '2.2.2' end - config.gem 'libxml-ruby', :version => '>= 1.1.1', :lib => 'libxml' + config.gem 'libxml-ruby', :version => '>= 2.0.5', :lib => 'libxml' config.gem 'rmagick', :lib => 'RMagick' config.gem 'oauth', :version => '>= 0.4.3' - config.gem 'oauth-plugin', :version => '>= 0.3.14' + config.gem 'oauth-plugin', :version => '0.3.14' config.gem 'httpclient' config.gem 'SystemTimer', :version => '>= 1.1.3', :lib => 'system_timer' config.gem 'sanitize' - config.gem 'i18n', :version => '>= 0.4.1' + config.gem 'i18n', :version => '>= 0.5.0' + if defined?(MEMCACHE_SERVERS) + config.gem 'memcached' + end # Only load the plugins named here, in the order given (default is alphabetical). # :all can be used as a placeholder for all plugins not explicitly named