Removes separated forest for zoom >= 12

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 6a1bbc66ed5154b23a24c90c41010158f3095b7e..be26c13b57d247d451f9f2bc08b204682fc92cf7 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,10 @@
 source "https://rubygems.org"
 
 # Require rails
-gem "rails", "4.2.0"
+gem "rails", "4.2.3"
+
+# Sprockets 3 seems to be buggy, so stick with 2 for now
+gem "sprockets", "~> 2.12.3"
 
 # Require things which have moved to gems in ruby 1.9
 gem "bigdecimal", "~> 1.1.0", :platforms => :ruby_19
@@ -42,18 +45,21 @@ gem "rails-i18n", "~> 4.0.0"
 gem "dynamic_form"
 gem "rinku", ">= 1.2.2", :require => "rails_rinku"
 gem "oauth-plugin", ">= 0.5.1"
-gem "open_id_authentication", ">= 1.1.0"
 gem "validates_email_format_of", ">= 1.5.1"
-gem "composite_primary_keys", "~> 8.0.0"
+gem "composite_primary_keys", "~> 8.1.0"
 gem "http_accept_language", "~> 2.0.0"
 gem "paperclip", "~> 4.0"
 gem "deadlock_retry", ">= 1.2.0"
-gem "openstreetmap-i18n-js", ">= 3.0.0.rc5.3", :require => "i18n-js"
+gem "i18n-js", ">= 3.0.0.rc10"
 gem "rack-cors"
 gem "actionpack-page_caching"
 
-# We need ruby-openid 2.2.0 or later for ruby 1.9 support
-gem "ruby-openid", ">= 2.2.0"
+# Omniauth for authentication
+gem "omniauth"
+gem "omniauth-openid"
+gem "openstreetmap-omniauth-google-oauth2", ">= 0.2.6.1", :require => "omniauth-google-oauth2"
+gem "omniauth-facebook"
+gem "omniauth-windowslive"
 
 # Markdown formatting support
 gem "redcarpet"
@@ -68,6 +74,9 @@ gem "htmlentities"
 # Load SystemTimer for implementing request timeouts
 gem "SystemTimer", ">= 1.1.3", :require => "system_timer", :platforms => :ruby_18
 
+# 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"
@@ -93,4 +102,5 @@ group :development, :test do
   gem "jshint"
   gem "konacha"
   gem "poltergeist"
+  gem "coveralls", :require => false
 end