diff options
| author | Jacob Vosmaer <jacob@gitlab.com> | 2018-06-05 17:58:28 +0200 |
|---|---|---|
| committer | Jacob Vosmaer <jacob@gitlab.com> | 2018-06-12 14:33:37 +0200 |
| commit | f376347f24f24efc157d80de63381dd22d060630 (patch) | |
| tree | 73dc59fbab206b2c5e79e6144b4d02c931da92a0 /spec/services/merge_requests | |
| parent | b2ef7f6cd9b98681aeb2274e29f0b3aaac423fc9 (diff) | |
| download | gitlab-ce-f376347f24f24efc157d80de63381dd22d060630.tar.gz | |
Find and mark more Git disk access locations, part 2
Diffstat (limited to 'spec/services/merge_requests')
| -rw-r--r-- | spec/services/merge_requests/squash_service_spec.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/spec/services/merge_requests/squash_service_spec.rb b/spec/services/merge_requests/squash_service_spec.rb index bd884787425..ded17fa92a4 100644 --- a/spec/services/merge_requests/squash_service_spec.rb +++ b/spec/services/merge_requests/squash_service_spec.rb @@ -63,7 +63,9 @@ describe MergeRequests::SquashService do end it 'has the same diff as the merge request, but a different SHA' do - rugged = project.repository.rugged + rugged = Gitlab::GitalyClient::StorageSettings.allow_disk_access do + project.repository.rugged + end mr_diff = rugged.diff(merge_request.diff_base_sha, merge_request.diff_head_sha) squash_diff = rugged.diff(merge_request.diff_start_sha, squash_sha) |