From b03b31659b0101dc4a5838bec7dca193706661cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mica=C3=ABl=20Bergeron?= Date: Fri, 2 Mar 2018 16:19:17 -0500 Subject: fixing some broken merges --- spec/workers/object_storage_upload_worker_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'spec/workers') diff --git a/spec/workers/object_storage_upload_worker_spec.rb b/spec/workers/object_storage_upload_worker_spec.rb index 5edc4bc499b..32ddcbe9757 100644 --- a/spec/workers/object_storage_upload_worker_spec.rb +++ b/spec/workers/object_storage_upload_worker_spec.rb @@ -20,7 +20,7 @@ describe ObjectStorageUploadWorker do stub_lfs_object_storage(background_upload: true) end - it 'uploads object to storage' d + it 'uploads object to storage' do expect { perform }.to change { lfs_object.reload.file_store }.from(local).to(remote) end -- cgit v1.2.1