X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/284b56bee93266eb1bb7b5be6f5cbb3a82428ca3..c9fdd5d3cb470e82b2cf457a022f034c0bda7e39:/Gemfile?ds=sidebyside diff --git a/Gemfile b/Gemfile index 51ce4cb2b..e3c8f5cff 100644 --- a/Gemfile +++ b/Gemfile @@ -3,9 +3,6 @@ source "https://rubygems.org" # Require rails gem "rails", "4.2.4" -# 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 @@ -60,7 +57,7 @@ gem "actionpack-page_caching" # Omniauth for authentication gem "omniauth" gem "omniauth-openid" -gem "openstreetmap-omniauth-google-oauth2", ">= 0.2.6.1", :require => "omniauth-google-oauth2" +gem "omniauth-google-oauth2", ">= 0.2.7" gem "omniauth-facebook" gem "omniauth-windowslive"