Test rendering of OAuth authorization page

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index ae9c96b1c4ee7fc21368bcb8ef928de64d88df04..e36912e735f64cacd56eef0a036971db1e4c50c2 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,10 @@
 source "https://rubygems.org"
 
 # Require rails
 source "https://rubygems.org"
 
 # Require rails

-gem "rails", "4.2.0"
+gem "rails", "4.2.3"
+
+# 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
 
 # Require things which have moved to gems in ruby 1.9
 gem "bigdecimal", "~> 1.1.0", :platforms => :ruby_19


@@ -43,17 +46,20 @@ gem "dynamic_form"
 gem "rinku", ">= 1.2.2", :require => "rails_rinku"
 gem "oauth-plugin", ">= 0.5.1"
 gem "validates_email_format_of", ">= 1.5.1"
 gem "rinku", ">= 1.2.2", :require => "rails_rinku"
 gem "oauth-plugin", ">= 0.5.1"
 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 "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"
 
 # Omniauth for authentication
 gem "omniauth"
 gem "omniauth-openid"
 gem "rack-cors"
 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-facebook"
+gem "omniauth-windowslive"

 
 # Markdown formatting support
 gem "redcarpet"
 
 # Markdown formatting support
 gem "redcarpet"


@@ -79,6 +85,9 @@ gem "soap4r-ruby1.9"
 gem "dalli"
 gem "kgio"
 
 gem "dalli"
 gem "kgio"
 

+# Used to generate logstash friendly log files
+gem "logstasher"
+

 # Gems useful for development
 group :development do
   gem "vendorer"
 # Gems useful for development
 group :development do
   gem "vendorer"