X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/724a9885953e381f2e8805ef9f5bc119c6f924e4..49edb79711b8fad5cc7a702c6f982644f34bbd83:/Gemfile

diff --git a/Gemfile b/Gemfile
index 017f8f310..dfd87eb84 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
 # Require rails
-gem "rails", "4.2.0"
+gem "rails", "4.2.6"
 
 # Require things which have moved to gems in ruby 1.9
 gem "bigdecimal", "~> 1.1.0", :platforms => :ruby_19
@@ -37,30 +37,36 @@ gem "r2"
 # Use autoprefixer to generate CSS prefixes
 gem "autoprefixer-rails"
 
+# Use image_optim to optimise images
+gem "image_optim", ">= 0.22.0"
+
 # Load rails plugins
 gem "rails-i18n", "~> 4.0.0"
 gem "dynamic_form"
 gem "rinku", ">= 1.2.2", :require => "rails_rinku"
 gem "oauth-plugin", ">= 0.5.1"
-gem "open_id_authentication", ">= 1.1.0"
 gem "validates_email_format_of", ">= 1.5.1"
-gem "composite_primary_keys", "~> 8.0.0"
+gem "composite_primary_keys", "~> 8.1.0"
 gem "http_accept_language", "~> 2.0.0"
 gem "paperclip", "~> 4.0"
 gem "deadlock_retry", ">= 1.2.0"
-gem "openstreetmap-i18n-js", ">= 3.0.0.rc5.3", :require => "i18n-js"
+gem "i18n-js", ">= 3.0.0.rc10"
 gem "rack-cors"
 gem "actionpack-page_caching"
 
-# We need ruby-openid 2.2.0 or later for ruby 1.9 support
-gem "ruby-openid", ">= 2.2.0"
+# 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"
 
 # Markdown formatting support
 gem "redcarpet"
 
-# Character conversion support for ruby 1.8
-gem "iconv", "= 0.1", :platforms => :ruby_18
-
 # Load libxml support for XML parsing and generation
 gem "libxml-ruby", ">= 2.0.5", :require => "libxml"
 
@@ -71,6 +77,9 @@ gem "htmlentities"
 # Load SystemTimer for implementing request timeouts
 gem "SystemTimer", ">= 1.1.3", :require => "system_timer", :platforms => :ruby_18
 
+# Load faraday for mockable HTTP client
+gem "faraday"
+
 # Load httpclient and soap4r for SOAP support for Quova GeoIP queries
 gem "httpclient"
 gem "soap4r-ruby1.9"
@@ -79,6 +88,9 @@ gem "soap4r-ruby1.9"
 gem "dalli"
 gem "kgio"
 
+# Used to generate logstash friendly log files
+gem "logstasher"
+
 # Gems useful for development
 group :development do
   gem "vendorer"
@@ -93,6 +105,8 @@ end
 
 # Needed in development as well so rake can see konacha tasks
 group :development, :test do
+  gem "jshint"
   gem "konacha"
   gem "poltergeist"
+  gem "coveralls", :require => false
 end