diff options
author | David Yip <yipdw@member.fsf.org> | 2018-01-20 16:37:35 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-20 16:37:35 -0600 |
commit | 24b6e4121f656d24adc5676e8a207ded610a7ea7 (patch) | |
tree | 1c7b908468e12a40a6433f02f86f2cf47fa53cf9 /app/models/account.rb | |
parent | b8c6656ce9e498f2e99d6301212bcd12e7f839df (diff) | |
parent | 3cae3622146d80aef8e43e5790d25f5e2fc9931e (diff) |
Merge pull request #342 from glitch-soc/merge-upstream
Merge upstream
Diffstat (limited to 'app/models/account.rb')
-rw-r--r-- | app/models/account.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/account.rb b/app/models/account.rb index c75ea028e..6df9668d5 100644 --- a/app/models/account.rb +++ b/app/models/account.rb @@ -104,7 +104,7 @@ class Account < ApplicationRecord has_many :lists, through: :list_accounts # Account migrations - belongs_to :moved_to_account, class_name: 'Account' + belongs_to :moved_to_account, class_name: 'Account', optional: true scope :remote, -> { where.not(domain: nil) } scope :local, -> { where(domain: nil) } |