diff options
| author | Jacob Vosmaer (GitLab) <jacob@gitlab.com> | 2018-06-01 11:56:29 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-06-01 11:56:29 +0000 |
| commit | edb9db37ede4aff12f06338e4fd8f30039cc8183 (patch) | |
| tree | 460bbcce4dd97fea12de3dd609345912636eadb9 /spec/lib/gitlab/conflict | |
| parent | cc5890f287b9dc5c117470d5b0925ba7f6d07485 (diff) | |
| download | gitlab-ce-edb9db37ede4aff12f06338e4fd8f30039cc8183.tar.gz | |
Add "deny disk access" Gitaly feature (tripswitch)
Diffstat (limited to 'spec/lib/gitlab/conflict')
| -rw-r--r-- | spec/lib/gitlab/conflict/file_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/lib/gitlab/conflict/file_spec.rb b/spec/lib/gitlab/conflict/file_spec.rb index 92792144429..5b343920429 100644 --- a/spec/lib/gitlab/conflict/file_spec.rb +++ b/spec/lib/gitlab/conflict/file_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' describe Gitlab::Conflict::File do let(:project) { create(:project, :repository) } let(:repository) { project.repository } - let(:rugged) { repository.rugged } + let(:rugged) { Gitlab::GitalyClient::StorageSettings.allow_disk_access { repository.rugged } } let(:their_commit) { rugged.branches['conflict-start'].target } let(:our_commit) { rugged.branches['conflict-resolvable'].target } let(:merge_request) { create(:merge_request, source_branch: 'conflict-resolvable', target_branch: 'conflict-start', source_project: project) } |