tarrien/Mastodon
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit '8a1423a47425dd67615e94bdfd13d64b53676da4' into glitch-soc/merge-upstream

Browse Source
This commit is contained in:
Claire committed 2024-03-20 18:31:09 +01:00
2 parents 8cac5d8f78 8a1423a474
commit c0aade79b0
11 files changed
+168 -31
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/controllers/admin/accounts_controller.rb
+1 -1
View File
@@ -128,7 +128,7 @@ module Admin
def unblock_email
authorize @account, :unblock_email?
CanonicalEmailBlock.where(reference_account: @account).delete_all
CanonicalEmailBlock.matching_account(@account).delete_all
log_action :unblock_email, @account