summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2018-01-06 14:21:45 +0100
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2018-01-06 14:21:45 +0100
commit1ab0ffe3830340c0c9c2def74f59c95a44bcf9f7 (patch)
treedb166c4176f51bb8c61061771f4fe3821af65d85
parentb50270a54efaa448e06018ad9a824ef4a512da31 (diff)
downloadgitlab-ce-1ab0ffe3830340c0c9c2def74f59c95a44bcf9f7.tar.gz
Update background stages migration timestamp
-rw-r--r--db/post_migrate/20180105101928_schedule_build_stage_migration.rb (renamed from db/post_migrate/20171205101928_schedule_build_stage_migration.rb)2
-rw-r--r--db/schema.rb2
-rw-r--r--spec/lib/gitlab/background_migration/migrate_build_stage_spec.rb2
-rw-r--r--spec/migrations/schedule_build_stage_migration_spec.rb2
4 files changed, 4 insertions, 4 deletions
diff --git a/db/post_migrate/20171205101928_schedule_build_stage_migration.rb b/db/post_migrate/20180105101928_schedule_build_stage_migration.rb
index 60293c60e8e..3d7f6278244 100644
--- a/db/post_migrate/20171205101928_schedule_build_stage_migration.rb
+++ b/db/post_migrate/20180105101928_schedule_build_stage_migration.rb
@@ -13,7 +13,7 @@ class ScheduleBuildStageMigration < ActiveRecord::Migration
def change
Build.where('stage_id IS NULL').each_batch(of: BATCH) do |builds, index|
builds.pluck(:id).map { |id| [MIGRATION, [id]] }.tap do |migrations|
- BackgroundMigrationWorker.perform_bulk_in(index.minutes, migrations)
+ BackgroundMigrationWorker.bulk_perform_in(index.minutes, migrations)
end
end
end
diff --git a/db/schema.rb b/db/schema.rb
index 740e80ccfd4..1eba30b28c8 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 20171230123729) do
+ActiveRecord::Schema.define(version: 20180105101928) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
diff --git a/spec/lib/gitlab/background_migration/migrate_build_stage_spec.rb b/spec/lib/gitlab/background_migration/migrate_build_stage_spec.rb
index baa9c532c6d..b675db463af 100644
--- a/spec/lib/gitlab/background_migration/migrate_build_stage_spec.rb
+++ b/spec/lib/gitlab/background_migration/migrate_build_stage_spec.rb
@@ -1,6 +1,6 @@
require 'spec_helper'
-describe Gitlab::BackgroundMigration::MigrateBuildStage, :migration, schema: 20171205101928 do
+describe Gitlab::BackgroundMigration::MigrateBuildStage, :migration, schema: 20180105101928 do
let(:projects) { table(:projects) }
let(:pipelines) { table(:ci_pipelines) }
let(:stages) { table(:ci_stages) }
diff --git a/spec/migrations/schedule_build_stage_migration_spec.rb b/spec/migrations/schedule_build_stage_migration_spec.rb
index c840d0b77fc..485ff84819d 100644
--- a/spec/migrations/schedule_build_stage_migration_spec.rb
+++ b/spec/migrations/schedule_build_stage_migration_spec.rb
@@ -1,5 +1,5 @@
require 'spec_helper'
-require Rails.root.join('db', 'post_migrate', '20171205101928_schedule_build_stage_migration')
+require Rails.root.join('db', 'post_migrate', '20180105101928_schedule_build_stage_migration')
describe ScheduleBuildStageMigration, :migration do
let(:projects) { table(:projects) }