diff options
| author | Micaël Bergeron <mbergeron@gitlab.com> | 2018-02-22 16:08:35 -0500 |
|---|---|---|
| committer | Micaël Bergeron <mbergeron@gitlab.com> | 2018-03-01 10:38:37 -0500 |
| commit | e43d7d2b4d4ccae4e7c7c89b68b6dc3ae8f34bb7 (patch) | |
| tree | 898ec571cb19cb9ab1a94e2cb206dc5280d8cbac | |
| parent | 5cf1cc6a0fe1a60cf51bc44535df8cc17d10b3a0 (diff) | |
| download | gitlab-ce-e43d7d2b4d4ccae4e7c7c89b68b6dc3ae8f34bb7.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 |
3 files changed, 3 insertions, 1 deletions
diff --git a/app/workers/all_queues.yml b/app/workers/all_queues.yml index 0a7656f69f0..9b1656be966 100644 --- a/app/workers/all_queues.yml +++ b/app/workers/all_queues.yml @@ -38,6 +38,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 ca1577591ba..de10335b006 100644 --- a/config/sidekiq_queues.yml +++ b/config/sidekiq_queues.yml @@ -69,4 +69,5 @@ - [project_migrate_hashed_storage, 1] - [storage_migrator, 1] - [pages_domain_verification, 1] + - [object_storage_upload, 1] - [object_storage, 1] diff --git a/db/schema.rb b/db/schema.rb index 5f3a11af49b..74dbb11c89b 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -1777,9 +1777,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 |