X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/f02729fa9a29089224502fecc7bf347fa73db0dd..0e6d4f18dabf9ccf00567886d8e373dbef1f6966:/Gemfile diff --git a/Gemfile b/Gemfile index 27f457d03..829403819 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 @@ -38,7 +38,7 @@ gem "r2" gem "autoprefixer-rails" # Use image_optim to optimise images -gem "image_optim", ">= 0.22.0" +gem "image_optim_rails" # Load rails plugins gem "rails-i18n", "~> 4.0.0" @@ -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" @@ -102,6 +101,7 @@ group :test do gem "rubocop" gem "timecop" gem "minitest", "~> 5.1", :platforms => [:ruby_19, :ruby_20] + gem "webmock" end # Needed in development as well so rake can see konacha tasks