diff options
Diffstat (limited to 'lib/gitlab/gitaly_client/conflicts_service.rb')
-rw-r--r-- | lib/gitlab/gitaly_client/conflicts_service.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/gitlab/gitaly_client/conflicts_service.rb b/lib/gitlab/gitaly_client/conflicts_service.rb index 300800189f1..982454b117e 100644 --- a/lib/gitlab/gitaly_client/conflicts_service.rb +++ b/lib/gitlab/gitaly_client/conflicts_service.rb @@ -14,11 +14,12 @@ module Gitlab @their_commit_oid = their_commit_oid end - def list_conflict_files + def list_conflict_files(allow_tree_conflicts: false) request = Gitaly::ListConflictFilesRequest.new( repository: @gitaly_repo, our_commit_oid: @our_commit_oid, - their_commit_oid: @their_commit_oid + their_commit_oid: @their_commit_oid, + allow_tree_conflicts: allow_tree_conflicts ) response = GitalyClient.call(@repository.storage, :conflicts_service, :list_conflict_files, request, timeout: GitalyClient.long_timeout) GitalyClient::ConflictFilesStitcher.new(response, @gitaly_repo) |