diff options
Diffstat (limited to 'lib/api/notification_settings.rb')
| -rw-r--r-- | lib/api/notification_settings.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/api/notification_settings.rb b/lib/api/notification_settings.rb index 8cd72d2ab15..e3d292eb2b0 100644 --- a/lib/api/notification_settings.rb +++ b/lib/api/notification_settings.rb @@ -39,8 +39,12 @@ module API notification_setting.transaction do new_notification_email = params.delete(:notification_email) - if new_notification_email - ::Users::UpdateService.new(current_user, user: current_user, notification_email: new_notification_email).execute + Gitlab::Database::QueryAnalyzers::PreventCrossDatabaseModification.temporary_ignore_tables_in_transaction( + %w[users user_details], url: 'https://gitlab.com/gitlab-org/gitlab/-/issues/424289' + ) do + if new_notification_email + ::Users::UpdateService.new(current_user, user: current_user, notification_email: new_notification_email).execute + end end notification_setting.update(declared_params(include_missing: false)) |