summaryrefslogtreecommitdiff
path: root/spec/workers
diff options
context:
space:
mode:
authorMicaël Bergeron <mbergeron@gitlab.com>2018-03-02 16:19:17 -0500
committerMicaël Bergeron <mbergeron@gitlab.com>2018-03-02 16:19:17 -0500
commitb03b31659b0101dc4a5838bec7dca193706661cd (patch)
tree3bd1004659f85da6d149f89700b7c0e8388f0b31 /spec/workers
parent4484587ef8c9bf63c60359a0980dda95e854b744 (diff)
downloadgitlab-ce-b03b31659b0101dc4a5838bec7dca193706661cd.tar.gz
fixing some broken merges
Diffstat (limited to 'spec/workers')
-rw-r--r--spec/workers/object_storage_upload_worker_spec.rb2
1 files changed, 1 insertions, 1 deletions
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