From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 31 May 2018 00:30:37 +0000 (+0200)
Subject: Fix nil error in migration (#7680)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=c61c4565ab17f7e882b93f96e4d97ff1681a7bcf;p=mastodon.git

Fix nil error in migration (#7680)

Under rare circumstances the user record could have already been deleted before...
---

diff --git a/db/migrate/20180528141303_fix_accounts_unique_index.rb b/db/migrate/20180528141303_fix_accounts_unique_index.rb
index 92e490f9e..aadb5b7db 100644
--- a/db/migrate/20180528141303_fix_accounts_unique_index.rb
+++ b/db/migrate/20180528141303_fix_accounts_unique_index.rb
@@ -49,7 +49,7 @@ class FixAccountsUniqueIndex < ActiveRecord::Migration[5.2]
         # are always either going to be local or not local, so only
         # one check is needed. Since we cannot support two users with
         # the same username locally, one has to go. 😢
-        other_account.user.destroy
+        other_account.user&.destroy
       end
 
       other_account.destroy