X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/c9893e186b32bfd8e8ee8f00e78258387f4aac9c..fa4bc2e623727fcca1ff40d9fbc477df134f2d59:/Gemfile

diff --git a/Gemfile b/Gemfile
index 09fa2d89b..0d31318b8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
 # Require rails
-gem "rails", "4.2.1"
+gem "rails", "4.2.2"
 
 # Sprockets 3 seems to be buggy, so stick with 2 for now
 gem "sprockets", "~> 2.12.3"
@@ -50,7 +50,7 @@ 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"
 
@@ -59,6 +59,7 @@ 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"