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

[rails.git] / lib / auth.rb

diff --git a/lib/auth.rb b/lib/auth.rb
index b00df09d0d20099de29f46d5588ec3fdc06d7b31..434994329d7b62a435335dbbeb6da5c3489ee4b5 100644 (file)
--- a/lib/auth.rb
+++ b/lib/auth.rb
@@ -3,5 +3,7 @@ module Auth
     providers["Google"] = "google" if defined?(GOOGLE_AUTH_ID)
     providers["Facebook"] = "facebook" if defined?(FACEBOOK_AUTH_ID)
     providers["Windows Live"] = "windowslive" if defined?(WINDOWSLIVE_AUTH_ID)
+    providers["GitHub"] = "github" if defined?(GITHUB_AUTH_ID)
+    providers["Wikipedia"] = "wikipedia" if defined?(WIKIPEDIA_AUTH_ID)
   end.freeze
 end