X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/cc4bca22b02043087ebdd39f149ef88013f8f498..28b886362755cb6750b62222cecf87bd9b2efbbe:/Gemfile?ds=sidebyside diff --git a/Gemfile b/Gemfile index 5e7a2c16e..084dd239f 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'http://rubygems.org' # Require rails -gem 'rails', '4.0.2' +gem 'rails', '4.0.3' # Require things which have moved to gems in ruby 1.9 gem 'bigdecimal', "~> 1.1.0", :platforms => :ruby_19 @@ -43,9 +43,9 @@ gem 'open_id_authentication', '>= 1.1.0' gem 'validates_email_format_of', '>= 1.5.1' gem 'composite_primary_keys', '>= 6.0.1' gem 'http_accept_language', '~> 2.0.0' -gem 'paperclip', '~> 3.0' +gem 'paperclip', '~> 4.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,8 +68,9 @@ 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'