From 9c320e800be3c8a2038495e52782c1fded257ca6 Mon Sep 17 00:00:00 2001 From: Yorick Peterse Date: Sat, 23 Sep 2017 12:30:59 +0000 Subject: Merge branch 'sh-fix-issue-38246' into 'master' Fix duplicate key errors in PostDeployMigrateUserExternalMailData migration Closes #38246 See merge request gitlab-org/gitlab-ce!14460 --- .../20170828170502_post_deploy_migrate_user_external_mail_data.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'db/post_migrate') diff --git a/db/post_migrate/20170828170502_post_deploy_migrate_user_external_mail_data.rb b/db/post_migrate/20170828170502_post_deploy_migrate_user_external_mail_data.rb index fefd931e5d2..a475b242921 100644 --- a/db/post_migrate/20170828170502_post_deploy_migrate_user_external_mail_data.rb +++ b/db/post_migrate/20170828170502_post_deploy_migrate_user_external_mail_data.rb @@ -33,7 +33,7 @@ class PostDeployMigrateUserExternalMailData < ActiveRecord::Migration SELECT true FROM user_synced_attributes_metadata WHERE user_id = users.id - AND provider = users.email_provider + AND provider = users.email_provider OR (provider IS NULL AND users.email_provider IS NULL) ) AND id BETWEEN #{start_id} AND #{end_id} EOF -- cgit v1.2.3