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

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

diff --git a/app/models/client_application.rb b/app/models/client_application.rb
index d11942beb6434e7c393db40ad3cfd5f3c3c4849b..5dafaaa5c7afefd4097e30f0d3f7283245dacf92 100644 (file)
--- a/app/models/client_application.rb
+++ b/app/models/client_application.rb
@@ -30,8 +30,6 @@
 #  client_applications_user_id_fkey  (user_id => users.id)
 #
 
-require "oauth"
-
 class ClientApplication < ActiveRecord::Base
   belongs_to :user
   has_many :tokens, :class_name => "OauthToken", :dependent => :delete_all