diff options
| author | Micaël Bergeron <mbergeron@gitlab.com> | 2018-02-22 16:08:35 -0500 |
|---|---|---|
| committer | Micaël Bergeron <mbergeron@gitlab.com> | 2018-02-22 16:08:35 -0500 |
| commit | ca0bedb6372040dcd395fd93028986932364dff7 (patch) | |
| tree | 3374ac7ed82507cd29f9756985ddb6dcf1db24e7 | |
| parent | cccec27dfa45d0b50d2500b9feba15d121358bfe (diff) | |
| download | gitlab-ce-ca0bedb6372040dcd395fd93028986932364dff7.tar.gz | |
fix the prepare_untracked_uploads_spec from using the EE schema
| -rw-r--r-- | app/workers/all_queues.yml | 1 | ||||
| -rw-r--r-- | config/sidekiq_queues.yml | 1 | ||||
| -rw-r--r-- | db/schema.rb | 2 | ||||
| -rw-r--r-- | spec/lib/gitlab/background_migration/prepare_untracked_uploads_spec.rb | 2 |
4 files changed, 4 insertions, 2 deletions
diff --git a/app/workers/all_queues.yml b/app/workers/all_queues.yml index cf936c78af1..d2cc3e92085 100644 --- a/app/workers/all_queues.yml +++ b/app/workers/all_queues.yml @@ -37,6 +37,7 @@ - github_importer:github_import_stage_import_pull_requests - github_importer:github_import_stage_import_repository +- object_storage_upload - object_storage:object_storage_background_move - object_storage:object_storage_migrate_uploads diff --git a/config/sidekiq_queues.yml b/config/sidekiq_queues.yml index fb2b71fdd6c..32ef4f67880 100644 --- a/config/sidekiq_queues.yml +++ b/config/sidekiq_queues.yml @@ -67,4 +67,5 @@ - [gcp_cluster, 1] - [project_migrate_hashed_storage, 1] - [storage_migrator, 1] + - [object_storage_upload, 1] - [object_storage, 1] diff --git a/db/schema.rb b/db/schema.rb index 08cfe5b15ea..d6c1ff134ef 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -1767,9 +1767,9 @@ ActiveRecord::Schema.define(version: 20180222152310) do t.string "model_type" t.string "uploader", null: false t.datetime "created_at", null: false - t.integer "store" t.string "mount_point" t.string "secret" + t.integer "store" end add_index "uploads", ["checksum"], name: "index_uploads_on_checksum", using: :btree diff --git a/spec/lib/gitlab/background_migration/prepare_untracked_uploads_spec.rb b/spec/lib/gitlab/background_migration/prepare_untracked_uploads_spec.rb index ca77e64ae40..de617e34124 100644 --- a/spec/lib/gitlab/background_migration/prepare_untracked_uploads_spec.rb +++ b/spec/lib/gitlab/background_migration/prepare_untracked_uploads_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe Gitlab::BackgroundMigration::PrepareUntrackedUploads, :sidekiq, :migration, schema: 20180129193323 do +describe Gitlab::BackgroundMigration::PrepareUntrackedUploads, :sidekiq, :migration, schema: 20180222152310 do include TrackUntrackedUploadsHelpers include MigrationsHelpers |