diff options
| author | Alessio Caiazza <acaiazza@gitlab.com> | 2018-06-04 13:57:51 +0200 |
|---|---|---|
| committer | Alessio Caiazza <acaiazza@gitlab.com> | 2018-06-04 13:57:51 +0200 |
| commit | 8ffcaf3b85fdf716ffeacf4e9d4c89b922de50b9 (patch) | |
| tree | 2e6acfa369e3e659ef4c6afb9290ad122a8fea5c /spec/lib/gitlab/conflict/file_spec.rb | |
| parent | 1841da16abe864b3dae19636fee9e9bbe9a01b56 (diff) | |
| parent | 23ae072ba2d601a3639a32f5a29302c430106bb8 (diff) | |
| download | gitlab-ce-8ffcaf3b85fdf716ffeacf4e9d4c89b922de50b9.tar.gz | |
Merge branch 'master' into 11-0-stable-prepare-rc211-0-stable-prepare-rc2
Diffstat (limited to 'spec/lib/gitlab/conflict/file_spec.rb')
| -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) } |