Commit 2f15b83e authored by Pavel Shutsin's avatar Pavel Shutsin

Merge branch 'cleanup_after_commit_hook_on_user_model' into 'master'

Cleanup obsolete after_commit logic on User

See merge request gitlab-org/gitlab!77049
parents 76ce6294 504e06e3
...@@ -291,21 +291,7 @@ class User < ApplicationRecord ...@@ -291,21 +291,7 @@ class User < ApplicationRecord
end end
end end
after_commit(on: :update) do after_commit(on: :update) do
if previous_changes.key?('email') update_invalid_gpg_signatures if previous_changes.key?('email')
# Add the old primary email to Emails if not added already - this should be removed
# after the background migration for MR https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70872/ has completed,
# as the primary email is now added to Emails upon confirmation
# Issue to remove that: https://gitlab.com/gitlab-org/gitlab/-/issues/344134
previous_confirmed_at = previous_changes.key?('confirmed_at') ? previous_changes['confirmed_at'][0] : confirmed_at
previous_email = previous_changes[:email][0]
if previous_confirmed_at && !emails.exists?(email: previous_email)
# rubocop: disable CodeReuse/ServiceClass
Emails::CreateService.new(self, user: self, email: previous_email).execute(confirmed_at: previous_confirmed_at)
# rubocop: enable CodeReuse/ServiceClass
end
update_invalid_gpg_signatures
end
end end
after_initialize :set_projects_limit after_initialize :set_projects_limit
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment