summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2017-05-10 20:33:51 -0500
committerDouwe Maan <douwe@selenight.nl>2017-05-10 20:33:51 -0500
commit965b41769f878ba526f88761b06182e6a2e0f538 (patch)
treebfea44f20e9ea0bd60fed961e116ccdcaa5d13a4
parent62c93ab91218daf176ccbfc1622a6f3c58f1ad82 (diff)
downloadgitlab-ce-965b41769f878ba526f88761b06182e6a2e0f538.tar.gz
Fix MySQL build failuredm-fix-mysql-failure
-rw-r--r--db/post_migrate/20170502101023_cleanup_namespaceless_pending_delete_projects.rb2
-rw-r--r--spec/migrations/cleanup_namespaceless_pending_delete_projects_spec.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/db/post_migrate/20170502101023_cleanup_namespaceless_pending_delete_projects.rb b/db/post_migrate/20170502101023_cleanup_namespaceless_pending_delete_projects.rb
index 2d242da9ef8..ce52de91cdd 100644
--- a/db/post_migrate/20170502101023_cleanup_namespaceless_pending_delete_projects.rb
+++ b/db/post_migrate/20170502101023_cleanup_namespaceless_pending_delete_projects.rb
@@ -30,7 +30,7 @@ class CleanupNamespacelessPendingDeleteProjects < ActiveRecord::Migration
private
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
BATCH_SIZE = 5000
diff --git a/spec/migrations/cleanup_namespaceless_pending_delete_projects_spec.rb b/spec/migrations/cleanup_namespaceless_pending_delete_projects_spec.rb
index 0b8af5010ba..49e750a3f4d 100644
--- a/spec/migrations/cleanup_namespaceless_pending_delete_projects_spec.rb
+++ b/spec/migrations/cleanup_namespaceless_pending_delete_projects_spec.rb
@@ -15,7 +15,7 @@ describe CleanupNamespacelessPendingDeleteProjects do
project = build(:empty_project, pending_delete: true, namespace_id: nil)
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
end