Merge remote-tracking branch 'openstreetmap/pull/1350'

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 41c85fd703c3ba3087be10e46a52afe16b08b54e..7d87708f16859503cb536b6d1b36a934c8eb0517 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
 # Require rails
 source "https://rubygems.org"
 
 # Require rails

-gem "rails", "4.2.5.2"
+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
 
 # Require things which have moved to gems in ruby 1.9
 gem "bigdecimal", "~> 1.1.0", :platforms => :ruby_19


@@ -63,6 +63,7 @@ gem "omniauth-openid"
 gem "omniauth-google-oauth2", ">= 0.2.7"
 gem "omniauth-facebook"
 gem "omniauth-windowslive"
 gem "omniauth-google-oauth2", ">= 0.2.7"
 gem "omniauth-facebook"
 gem "omniauth-windowslive"

+gem "omniauth-github"

 
 # Markdown formatting support
 gem "redcarpet"
 
 # Markdown formatting support
 gem "redcarpet"


@@ -80,9 +81,8 @@ gem "SystemTimer", ">= 1.1.3", :require => "system_timer", :platforms => :ruby_1
 # Load faraday for mockable HTTP client
 gem "faraday"
 
 # 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"
 
 # Load memcache client in case we are using it
 gem "dalli"


@@ -101,6 +101,7 @@ group :test do
   gem "rubocop"
   gem "timecop"
   gem "minitest", "~> 5.1", :platforms => [:ruby_19, :ruby_20]
   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
 end
 
 # Needed in development as well so rake can see konacha tasks


@@ -108,5 +109,6 @@ group :development, :test do
   gem "jshint"
   gem "konacha"
   gem "poltergeist"
   gem "jshint"
   gem "konacha"
   gem "poltergeist"

+  gem "factory_girl_rails"

   gem "coveralls", :require => false
 end
   gem "coveralls", :require => false
 end