X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/82cefb5929ad2d3945da43040279626336e44ee6..91d22710ba4b64d8c15f33f694a7a9206556b825:/Gemfile diff --git a/Gemfile b/Gemfile index e36912e73..e3c8f5cff 100644 --- a/Gemfile +++ b/Gemfile @@ -1,10 +1,7 @@ source "https://rubygems.org" # Require rails -gem "rails", "4.2.3" - -# Sprockets 3 seems to be buggy, so stick with 2 for now -gem "sprockets", "~> 2.12.3" +gem "rails", "4.2.4" # Require things which have moved to gems in ruby 1.9 gem "bigdecimal", "~> 1.1.0", :platforms => :ruby_19 @@ -40,6 +37,9 @@ gem "r2" # Use autoprefixer to generate CSS prefixes gem "autoprefixer-rails" +# Use image_optim to optimise images +gem "image_optim" + # Load rails plugins gem "rails-i18n", "~> 4.0.0" gem "dynamic_form" @@ -57,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"