X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/1801419d9da6cda69e2db1391fd2c0d421cc3429..283d04a117bad672862c26ac09c2f82cbbfecc59:/Gemfile diff --git a/Gemfile b/Gemfile index c423e66a0..7c916b011 100644 --- a/Gemfile +++ b/Gemfile @@ -3,6 +3,9 @@ source "https://rubygems.org" # Require rails gem "rails", "4.2.1" +# 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 @@ -54,6 +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" # Markdown formatting support gem "redcarpet"