diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-11-20 19:04:30 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-11-20 19:04:30 +0000 |
| commit | 31ba9870ceaa0ec098cae2d0332f4cf5b10e374f (patch) | |
| tree | f3eb657c7e6a67993516d0cb702d20f9a9688cfe | |
| parent | 340a5e70a24089d0cc1523d51e0bd9e070af06ab (diff) | |
| parent | 17132b99aaae9a398a7ae11e95b08fa0eedea0b1 (diff) | |
| download | gitlab-ce-31ba9870ceaa0ec098cae2d0332f4cf5b10e374f.tar.gz | |
Merge branch 'fix-mr-cleanup' into 'master'
Fix merge_requests.source_project_id migration
See merge request gitlab-org/gitlab-ce!15496
| -rw-r--r-- | db/migrate/20171114161914_merge_requests_source_project_id_foreign_key.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/db/migrate/20171114161914_merge_requests_source_project_id_foreign_key.rb b/db/migrate/20171114161914_merge_requests_source_project_id_foreign_key.rb index 2965e580c84..99740f64fe6 100644 --- a/db/migrate/20171114161914_merge_requests_source_project_id_foreign_key.rb +++ b/db/migrate/20171114161914_merge_requests_source_project_id_foreign_key.rb @@ -21,15 +21,15 @@ class MergeRequestsSourceProjectIdForeignKey < ActiveRecord::Migration end def up - MergeRequest.with_orphaned_source_projects.each_batch(of: 100) do |batch| - batch.update_all(source_project_id: nil) - end - # We need to allow NULL values so we can nullify the column when the source # project is removed. We _don't_ want to remove the merge request, instead # the application will keep them but close them. change_column_null(:merge_requests, :source_project_id, true) + MergeRequest.with_orphaned_source_projects.each_batch(of: 100) do |batch| + batch.update_all(source_project_id: nil) + end + add_concurrent_foreign_key( :merge_requests, :projects, |