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

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

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