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

apply feedback

Browse source
This commit is contained in:
Micaël Bergeron 2018-03-30 08:38:56 -04:00
parent 153dfda3a2
commit 316eb6ef60
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/tasks/gitlab/uploads/migrate.rake
View file

@ -25,7 +25,7 @@ namespace :gitlab do
Upload.class_eval { include EachBatch } unless Upload < EachBatch
Upload
.where(store: [nil, 1],
.where(store: [nil, ObjectStorage::Store::LOCAL],
uploader: @uploader_class.to_s,
model_type: @model_class.base_class.sti_name)
end

4
spec/tasks/gitlab/uploads/migrate_rake_spec.rb
View file

@ -30,9 +30,11 @@ describe 'gitlab:uploads:migrate rake tasks' do
end
end
it_behaves_like 'enqueue jobs in batch', batch: 4
context 'Upload has store = nil' do
before do
Upload.where(model: projects.first(5)).update_all(store: nil)
Upload.where(model: projects).update_all(store: nil)
end
it_behaves_like 'enqueue jobs in batch', batch: 4