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

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

diff --git a/app/models/client_application.rb b/app/models/client_application.rb
index d11942beb6434e7c393db40ad3cfd5f3c3c4849b..67ff075f1adb5bd1d8d6109077cdefd08233c26d 100644 (file)
--- a/app/models/client_application.rb
+++ b/app/models/client_application.rb
@@ -30,9 +30,7 @@
 #  client_applications_user_id_fkey  (user_id => users.id)
 #
 
-require "oauth"
-
-class ClientApplication < ActiveRecord::Base
+class ClientApplication < ApplicationRecord
   belongs_to :user
   has_many :tokens, :class_name => "OauthToken", :dependent => :delete_all
   has_many :access_tokens
@@ -69,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