summaryrefslogtreecommitdiff
path: root/app/models
diff options
context:
space:
mode:
authorPeter Kozak <spag@golwen.net>2013-03-13 11:55:48 -0400
committerPeter Kozak <spag@golwen.net>2013-03-13 11:55:48 -0400
commit7b178c1fa23fd3482f8e74a457cb3bc4a689838a (patch)
tree1fb79d1c2a554a7ae910386583f5e20b298673e7 /app/models
parentff991ce3d6c999783b8a5d3cae7b8e4635406a83 (diff)
parentc9dde701750d237a9a07c31ecf402940af2d7d18 (diff)
Merge branch 'develop' of github.com:amooma/GS5 into develop
Diffstat (limited to 'app/models')
-rw-r--r--app/models/user.rb2
1 files changed, 0 insertions, 2 deletions
diff --git a/app/models/user.rb b/app/models/user.rb
index 6091e32..b74fc06 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -74,8 +74,6 @@ class User < ActiveRecord::Base
has_many :fax_accounts, :as => :fax_accountable, :dependent => :destroy
- has_many :system_messages, :dependent => :destroy
-
has_many :auto_destroy_access_authorization_phone_numbers, :class_name => 'PhoneNumber', :foreign_key => 'access_authorization_user_id', :dependent => :destroy
belongs_to :current_tenant, :class_name => 'Tenant'