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

[rails.git] / lib / auth.rb

diff --git a/lib/auth.rb b/lib/auth.rb
index bc1ee8ec6446e75a7d4d70e4710d5c522c8b3dc5..729772477757ac810113e6abf77a92fead58e904 100644 (file)
--- a/lib/auth.rb
+++ b/lib/auth.rb
@@ -3,12 +3,11 @@ 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)
       providers[I18n.t("auth.providers.facebook")] = "facebook" if Settings.key?(:facebook_auth_id)
       I18n.t("auth.providers.openid") => "openid"
     }.tap do |providers|
       providers[I18n.t("auth.providers.google")] = "google" if Settings.key?(:google_auth_id)
       providers[I18n.t("auth.providers.facebook")] = "facebook" if Settings.key?(:facebook_auth_id)

-      providers[I18n.t("auth.providers.windowslive")] = "windowslive" if Settings.key?(:windowslive_auth_id)
+      providers[I18n.t("auth.providers.microsoft")] = "microsoft" if Settings.key?(:microsoft_auth_id)

       providers[I18n.t("auth.providers.github")] = "github" if Settings.key?(:github_auth_id)
       providers[I18n.t("auth.providers.wikipedia")] = "wikipedia" if Settings.key?(:wikipedia_auth_id)
     end.freeze
       providers[I18n.t("auth.providers.github")] = "github" if Settings.key?(:github_auth_id)
       providers[I18n.t("auth.providers.wikipedia")] = "wikipedia" if Settings.key?(:wikipedia_auth_id)
     end.freeze