X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d375caf7a3a2601ff00b127537e8d78d387d0ad5..5b6558c0f29013e85c9c398a61872f9dad5a69c5:/Gemfile diff --git a/Gemfile b/Gemfile index 94eb39681..8e0663427 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'http://rubygems.org' # Require rails -gem 'rails', '4.0.1' +gem 'rails', '4.0.2' # Require things which have moved to gems in ruby 1.9 gem 'bigdecimal', "~> 1.1.0", :platforms => :ruby_19 @@ -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 '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' @@ -68,11 +68,12 @@ gem 'htmlentities' # 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 'soap4r-ruby1.9' # Load memcache client in case we are using it -gem 'dalli' +gem 'dalli', '~> 2.6.4' gem 'kgio' # Gems useful for development