diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-02-27 16:09:33 +0300 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-02-28 23:28:26 +0300 |
| commit | a22f6fa6e50bb31921415b01fd345d6802581390 (patch) | |
| tree | 4e617f85dd0500b1c0bb004f9a4ed3e2000df818 /spec/requests/lfs_http_spec.rb | |
| parent | b4dc556c2f40f2e8e4d71c5dd8d1747974f8147f (diff) | |
Merge branch 'fix/sm/atomic-migration' into 'master'
Fix migrate! method (Minimal fix with ExclusiveLock to prevent race conditions)
Closes #4928 and #4980
See merge request gitlab-org/gitlab-ee!4624
Diffstat (limited to 'spec/requests/lfs_http_spec.rb')
| -rw-r--r-- | spec/requests/lfs_http_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/requests/lfs_http_spec.rb b/spec/requests/lfs_http_spec.rb index b244d29a305..04c0114b5d6 100644 --- a/spec/requests/lfs_http_spec.rb +++ b/spec/requests/lfs_http_spec.rb @@ -997,7 +997,7 @@ describe 'Git LFS API and storage' do context 'and workhorse requests upload finalize for a new lfs object' do before do - allow_any_instance_of(LfsObjectUploader).to receive(:exists?) { false } + lfs_object.destroy end context 'with object storage disabled' do |