X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/c70a1fe9334cf8978ae254d712a8e445e2fa1996..cbff014368294747154cd0c6dd30242f876d2daf:/Gemfile diff --git a/Gemfile b/Gemfile index 07bb60c68..2cbb1cbef 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source "https://rubygems.org" # Require rails -gem "rails", "4.2.7" +gem "rails", "4.2.7.1" # Require things which have moved to gems in ruby 1.9 gem "bigdecimal", "~> 1.1.0", :platforms => :ruby_19 @@ -81,9 +81,8 @@ gem "SystemTimer", ">= 1.1.3", :require => "system_timer", :platforms => :ruby_1 # Load faraday for mockable HTTP client gem "faraday" -# Load httpclient and soap4r for SOAP support for Quova GeoIP queries -gem "httpclient" -gem "soap4r-ruby1.9" +# Load geoip for querying Maxmind GeoIP database +gem "geoip" # Load memcache client in case we are using it gem "dalli" @@ -109,5 +108,6 @@ group :development, :test do gem "jshint" gem "konacha" gem "poltergeist" + gem "factory_girl_rails" gem "coveralls", :require => false end