diff options
Diffstat (limited to 'app/serializers/diffs_entity.rb')
| -rw-r--r-- | app/serializers/diffs_entity.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/serializers/diffs_entity.rb b/app/serializers/diffs_entity.rb index c818fcd6215..759d1e0f10a 100644 --- a/app/serializers/diffs_entity.rb +++ b/app/serializers/diffs_entity.rb @@ -74,7 +74,7 @@ class DiffsEntity < Grape::Entity options.merge( submodule_links: submodule_links, code_navigation_path: code_navigation_path(diffs), - conflicts: conflicts(allow_tree_conflicts: options[:allow_tree_conflicts]) + conflicts: (conflicts(allow_tree_conflicts: true) if options[:merge_conflicts_in_diff]) ) ) end |