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

[rails.git] / app / models / client_application.rb

diff --git a/app/models/client_application.rb b/app/models/client_application.rb
index 67b86417a3a6a069a23d45e5e059c7b4aa415b87..c95ffc322ce722bba0ce9f44293c4b0b1cc1c5fd 100644 (file)
--- a/app/models/client_application.rb
+++ b/app/models/client_application.rb
@@ -68,7 +68,7 @@ class ClientApplication < ActiveRecord::Base
   end
 
   def oauth_server
-    @oauth_server ||= OAuth::Server.new("http://" + SERVER_URL)
+    @oauth_server ||= OAuth::Server.new("https://" + SERVER_URL)
   end
 
   def credentials