Merge remote-tracking branch 'upstream/pull/5304'

[rails.git] / lib / auth.rb

diff --git a/lib/auth.rb b/lib/auth.rb
index 01167fb1d6695bd9089617f1d1ee259bdb61057c..729772477757ac810113e6abf77a92fead58e904 100644 (file)
--- a/lib/auth.rb
+++ b/lib/auth.rb
@@ -3,7 +3,6 @@ module Auth
 
   def self.providers
     @providers[I18n.locale] ||= {
 
   def self.providers
     @providers[I18n.locale] ||= {

-      I18n.t("auth.providers.none") => "",

       I18n.t("auth.providers.openid") => "openid"
     }.tap do |providers|
       providers[I18n.t("auth.providers.google")] = "google" if Settings.key?(:google_auth_id)
       I18n.t("auth.providers.openid") => "openid"
     }.tap do |providers|
       providers[I18n.t("auth.providers.google")] = "google" if Settings.key?(:google_auth_id)