X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c96eb7d1813e082418b63825b00f722b056774f8..ab12b6161aa61463d7fbb0a9c77ae1d9ae14082a:/Gemfile diff --git a/Gemfile b/Gemfile index 4a00841ec..27f457d03 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source "https://rubygems.org" # Require rails -gem "rails", "4.2.4" +gem "rails", "4.2.7" # Require things which have moved to gems in ruby 1.9 gem "bigdecimal", "~> 1.1.0", :platforms => :ruby_19 @@ -38,7 +38,7 @@ gem "r2" gem "autoprefixer-rails" # Use image_optim to optimise images -gem "openstreetmap-image_optim", ">= 0.21.0.1", :require => "image_optim" +gem "image_optim", ">= 0.22.0" # Load rails plugins gem "rails-i18n", "~> 4.0.0" @@ -54,12 +54,16 @@ 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 "omniauth-google-oauth2", ">= 0.2.7" gem "omniauth-facebook" gem "omniauth-windowslive" +gem "omniauth-github" # Markdown formatting support gem "redcarpet" @@ -105,5 +109,6 @@ group :development, :test do gem "jshint" gem "konacha" gem "poltergeist" + gem "factory_girl_rails" gem "coveralls", :require => false end