diff options
Diffstat (limited to 'app/serializers/diffs_metadata_entity.rb')
| -rw-r--r-- | app/serializers/diffs_metadata_entity.rb | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/app/serializers/diffs_metadata_entity.rb b/app/serializers/diffs_metadata_entity.rb index 681e629244f..8c226130f6e 100644 --- a/app/serializers/diffs_metadata_entity.rb +++ b/app/serializers/diffs_metadata_entity.rb @@ -2,8 +2,13 @@ class DiffsMetadataEntity < DiffsEntity unexpose :diff_files - expose :diff_files, using: DiffFileMetadataEntity do |diffs, _| - diffs.raw_diff_files(sorted: true) + expose :diff_files do |diffs, options| + DiffFileMetadataEntity.represent( + diffs.raw_diff_files(sorted: true), + options.merge( + conflicts: conflicts(allow_tree_conflicts: options[:allow_tree_conflicts]) + ) + ) end expose :conflict_resolution_path do |_, options| |