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

Merge branch 'dm-fix-mysql-failure' into 'master' 

Fix MySQL build failure

Closes #32106

See merge request !11277
This commit is contained in:
Sean McGivern 2017-05-11 09:18:42 +00:00
parent 934e8d1a65 965b41769f
commit 667005d5ac
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/post_migrate/20170502101023_cleanup_namespaceless_pending_delete_projects.rb
View File

@ -30,7 +30,7 @@ class CleanupNamespacelessPendingDeleteProjects < ActiveRecord::Migration
private private
def pending_delete_batch def pending_delete_batch
connection.exec_query(find_batch).map{ |row| row['id'] } connection.exec_query(find_batch).map{ |row| row['id'].to_i }
end end
BATCH_SIZE = 5000 BATCH_SIZE = 5000

2
spec/migrations/cleanup_namespaceless_pending_delete_projects_spec.rb
View File

@ -15,7 +15,7 @@ describe CleanupNamespacelessPendingDeleteProjects do
project = build(:empty_project, pending_delete: true, namespace_id: nil) project = build(:empty_project, pending_delete: true, namespace_id: nil)
project.save(validate: false) project.save(validate: false)
expect(NamespacelessProjectDestroyWorker).to receive(:bulk_perform_async).with([[project.id.to_s]]) expect(NamespacelessProjectDestroyWorker).to receive(:bulk_perform_async).with([[project.id]])
described_class.new.up described_class.new.up
end end