diff options
| author | nicolas <nclm@users.noreply.github.com> | 2016-11-25 13:33:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-25 13:33:00 +0100 |
| commit | 959e4b81987080353415556cc3bbd2aab478adb4 (patch) | |
| tree | 5db6ed034f98ac8f2ef34b48d2032b74617d21d1 /app/models/account.rb | |
| parent | effdb42f4c63b957cfdef37a44dfa45284ece337 (diff) | |
| parent | 8a3745a4df89f5a5f980370dabfab8f95c92a5f8 (diff) | |
Merge branch 'master' into french-translation
Diffstat (limited to 'app/models/account.rb')
| -rw-r--r-- | app/models/account.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/account.rb b/app/models/account.rb index a60a23e14..870de8b7c 100644 --- a/app/models/account.rb +++ b/app/models/account.rb @@ -66,12 +66,12 @@ class Account < ApplicationRecord def unfollow!(other_account) follow = active_relationships.find_by(target_account: other_account) - follow.destroy unless follow.nil? + follow&.destroy end def unblock!(other_account) block = block_relationships.find_by(target_account: other_account) - block.destroy unless block.nil? + block&.destroy end def following?(other_account) |