diff options
Diffstat (limited to 'app/services/merge_requests/conflicts/list_service.rb')
-rw-r--r-- | app/services/merge_requests/conflicts/list_service.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/services/merge_requests/conflicts/list_service.rb b/app/services/merge_requests/conflicts/list_service.rb index 30a493e91ce..575a6bfe95a 100644 --- a/app/services/merge_requests/conflicts/list_service.rb +++ b/app/services/merge_requests/conflicts/list_service.rb @@ -23,7 +23,11 @@ module MergeRequests end def conflicts - @conflicts ||= Gitlab::Conflict::FileCollection.new(merge_request) + @conflicts ||= + Gitlab::Conflict::FileCollection.new( + merge_request, + allow_tree_conflicts: params[:allow_tree_conflicts] + ) end end end |