Convert OpenID authentication to use OmniAuth

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index b8657bae168ebfe7487a80e9b854f7a22d6d8856..a459fabc41fdfe78a666054271a25d9168f30899 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -42,7 +42,6 @@ gem "rails-i18n", "~> 4.0.0"
 gem "dynamic_form"
 gem "rinku", ">= 1.2.2", :require => "rails_rinku"
 gem "oauth-plugin", ">= 0.5.1"
 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 "http_accept_language", "~> 2.0.0"
 gem "validates_email_format_of", ">= 1.5.1"
 gem "composite_primary_keys", "~> 8.0.0"
 gem "http_accept_language", "~> 2.0.0"


@@ -52,15 +51,13 @@ gem "openstreetmap-i18n-js", ">= 3.0.0.rc5.3", :require => "i18n-js"
 gem "rack-cors"
 gem "actionpack-page_caching"
 
 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"
+# Omniauth for authentication
+gem "omniauth"
+gem "omniauth-openid"

 
 # Markdown formatting support
 gem "redcarpet"
 
 
 # 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"
 
 # Load libxml support for XML parsing and generation
 gem "libxml-ruby", ">= 2.0.5", :require => "libxml"
 


@@ -86,12 +83,14 @@ end
 
 # Gems needed for running tests
 group :test do
 
 # Gems needed for running tests
 group :test do

+  gem "rubocop"

   gem "timecop"
   gem "minitest", "~> 5.1", :platforms => [:ruby_19, :ruby_20]
 end
 
 # Needed in development as well so rake can see konacha tasks
 group :development, :test do
   gem "timecop"
   gem "minitest", "~> 5.1", :platforms => [:ruby_19, :ruby_20]
 end
 
 # Needed in development as well so rake can see konacha tasks
 group :development, :test do

+  gem "jshint"

   gem "konacha"
   gem "poltergeist"
 end
   gem "konacha"
   gem "poltergeist"
 end