kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'sh-fix-email-provider-take2' into 'master' 

Fix PG::UniqueViolation external_email migration

Closes #38246

See merge request gitlab-org/gitlab-ce!14474
This commit is contained in:
Yorick Peterse 2017-09-25 14:39:25 +00:00
parent 8b1a3d40e7 edb82271ae
commit b83dcd3a30
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
db/migrate/20170828135939_migrate_user_external_mail_data.rb
View File

@ -33,7 +33,7 @@ class MigrateUserExternalMailData < ActiveRecord::Migration
SELECT true
FROM user_synced_attributes_metadata
WHERE user_id = users.id
AND provider = users.email_provider OR (provider IS NULL AND users.email_provider IS NULL)
AND (provider = users.email_provider OR (provider IS NULL AND users.email_provider IS NULL))
)
AND id BETWEEN #{start_id} AND #{end_id}
EOF

2
db/post_migrate/20170828170502_post_deploy_migrate_user_external_mail_data.rb
View File

@ -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 OR (provider IS NULL AND users.email_provider IS NULL)
AND (provider = users.email_provider OR (provider IS NULL AND users.email_provider IS NULL))
)
AND id BETWEEN #{start_id} AND #{end_id}
EOF