Merge branch 'master' into openstreetbugs

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

diff --git a/app/models/client_application.rb b/app/models/client_application.rb
index b1f4022928fad8f6bf27a85de8a00ac1a694483c..9a074fb30b21ed0421026a963f46fe6247a3d2ab 100644 (file)
--- a/app/models/client_application.rb
+++ b/app/models/client_application.rb
@@ -2,7 +2,7 @@ require 'oauth'
 
 class ClientApplication < ActiveRecord::Base
   belongs_to :user
 
 class ClientApplication < ActiveRecord::Base
   belongs_to :user

-  has_many :tokens, :class_name => "OauthToken"
+  has_many :tokens, :class_name => "OauthToken", :dependent => :delete_all

   has_many :access_tokens
   has_many :oauth2_verifiers
   has_many :oauth_tokens
   has_many :access_tokens
   has_many :oauth2_verifiers
   has_many :oauth_tokens