diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-12-15 10:59:21 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-12-15 10:59:21 +0000 |
| commit | 9c12cb537550963c30c7c100cc0ed17957ce49a1 (patch) | |
| tree | 1053fa539f23fc6124d901b8080ded9aa850923a /spec | |
| parent | 8c34a01d7fa6ae190d37ef8f304d1d2deff92ecf (diff) | |
| parent | 240945f87edf80e7f9a4e991b99fd4ade28aaabd (diff) | |
| download | gitlab-ce-9c12cb537550963c30c7c100cc0ed17957ce49a1.tar.gz | |
Merge branch 'gitaly-conflicts-prep' into 'master'
Simplify conflict resolver interface
See merge request gitlab-org/gitlab-ce!15897
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/services/merge_requests/conflicts/resolve_service_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/services/merge_requests/conflicts/resolve_service_spec.rb b/spec/services/merge_requests/conflicts/resolve_service_spec.rb index 5376083e7f5..e28d8d7ae5c 100644 --- a/spec/services/merge_requests/conflicts/resolve_service_spec.rb +++ b/spec/services/merge_requests/conflicts/resolve_service_spec.rb @@ -213,7 +213,7 @@ describe MergeRequests::Conflicts::ResolveService do MergeRequests::Conflicts::ListService.new(merge_request).conflicts.resolver end let(:regex_conflict) do - resolver.conflict_for_path('files/ruby/regex.rb', 'files/ruby/regex.rb') + resolver.conflict_for_path(resolver.conflicts, 'files/ruby/regex.rb', 'files/ruby/regex.rb') end let(:invalid_params) do |