Merge branch 'master' into openstreetbugs

[rails.git] / config / environment.rb

diff --git a/config/environment.rb b/config/environment.rb
index 7e550ca9f42a07f7ccfa62475053ae1d70dbc9df..ce5a89350dae69af277772029dbc2c1f3ebcdbd5 100644 (file)
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -21,11 +21,14 @@ Rails::Initializer.run do |config|
   config.gem 'libxml-ruby', :version => '>= 1.1.1', :lib => 'libxml'
   config.gem 'rmagick', :lib => 'RMagick'
   config.gem 'oauth', :version => '>= 0.4.3'
   config.gem 'libxml-ruby', :version => '>= 1.1.1', :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 '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
 
   # 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