Remove a couple of TODOs

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 5e7a2c16ebcb7727536e2c0e5c9e08e55899f79c..8e06634272b314051dc94350216ecf38048b8304 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -45,7 +45,7 @@ gem 'composite_primary_keys', '>= 6.0.1'
 gem 'http_accept_language', '~> 2.0.0'
 gem 'paperclip', '~> 3.0'
 gem 'deadlock_retry', '>= 1.2.0'
 gem 'http_accept_language', '~> 2.0.0'
 gem 'paperclip', '~> 3.0'
 gem 'deadlock_retry', '>= 1.2.0'

-gem 'openstreetmap-i18n-js', '>= 3.0.0.rc5.2', :require => 'i18n-js'
+gem 'openstreetmap-i18n-js', '>= 3.0.0.rc5.3', :require => 'i18n-js'

 gem 'rack-cors'
 gem 'actionpack-page_caching'
 
 gem 'rack-cors'
 gem 'actionpack-page_caching'
 


@@ -68,11 +68,12 @@ gem 'htmlentities'
 # Load SystemTimer for implementing request timeouts
 gem 'SystemTimer', '>= 1.1.3', :require => 'system_timer', :platforms => :ruby_18
 
 # Load SystemTimer for implementing request timeouts
 gem 'SystemTimer', '>= 1.1.3', :require => 'system_timer', :platforms => :ruby_18
 

-# Load httpclient for SOAP support for Quova GeoIP queries
+# Load httpclient and soap4r for SOAP support for Quova GeoIP queries

 gem 'httpclient'
 gem 'httpclient'

+gem 'soap4r-ruby1.9'

 
 # Load memcache client in case we are using it
 
 # Load memcache client in case we are using it

-gem 'dalli'
+gem 'dalli', '~> 2.6.4'

 gem 'kgio'
 
 # Gems useful for development
 gem 'kgio'
 
 # Gems useful for development