X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/284b56bee93266eb1bb7b5be6f5cbb3a82428ca3..5ffdceeb4d5e66ce3029f372e84554d28673e690:/Gemfile diff --git a/Gemfile b/Gemfile index 51ce4cb2b..3789c9fb8 100644 --- a/Gemfile +++ b/Gemfile @@ -1,10 +1,7 @@ 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" +gem "rails", "4.2.5" # Require things which have moved to gems in ruby 1.9 gem "bigdecimal", "~> 1.1.0", :platforms => :ruby_19 @@ -41,7 +38,7 @@ gem "r2" gem "autoprefixer-rails" # Use image_optim to optimise images -gem "image_optim" +gem "image_optim", ">= 0.22.0" # Load rails plugins gem "rails-i18n", "~> 4.0.0" @@ -57,10 +54,13 @@ gem "i18n-js", ">= 3.0.0.rc10" gem "rack-cors" gem "actionpack-page_caching" +# Sanitise URIs +gem "rack-uri_sanitizer" + # 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"