diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-20 16:18:24 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-20 16:18:24 +0300 |
commit | 0653e08efd039a5905f3fa4f6e9cef9f5d2f799c (patch) | |
tree | 4dcc884cf6d81db44adae4aa99f8ec1233a41f55 /app/services/emails/destroy_service.rb | |
parent | 744144d28e3e7fddc117924fef88de5d9674fe4c (diff) |
Add latest changes from gitlab-org/gitlab@14-3-stable-eev14.3.0-rc42
Diffstat (limited to 'app/services/emails/destroy_service.rb')
-rw-r--r-- | app/services/emails/destroy_service.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/services/emails/destroy_service.rb b/app/services/emails/destroy_service.rb index 288bee84ef7..d10833e66cb 100644 --- a/app/services/emails/destroy_service.rb +++ b/app/services/emails/destroy_service.rb @@ -3,14 +3,14 @@ module Emails class DestroyService < ::Emails::BaseService def execute(email) - email.destroy && update_secondary_emails! + email.destroy && update_secondary_emails!(email.email) end private - def update_secondary_emails! + def update_secondary_emails!(deleted_email) result = ::Users::UpdateService.new(@current_user, user: @user).execute do |user| - user.update_secondary_emails! + user.unset_secondary_emails_matching_deleted_email!(deleted_email) end result[:status] == :success |