diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-01 15:11:22 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-01 15:11:22 +0000 |
| commit | eac94e5cd6a59aad41ff1f86ed7cc892898d8516 (patch) | |
| tree | 0fb81af921599437d44d6ad9b776892b74ae74c1 /app/serializers/diffs_metadata_entity.rb | |
| parent | 3a5bee787984a139396c64372b6e14c4cb26efc1 (diff) | |
| download | gitlab-ce-eac94e5cd6a59aad41ff1f86ed7cc892898d8516.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/serializers/diffs_metadata_entity.rb')
| -rw-r--r-- | app/serializers/diffs_metadata_entity.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/serializers/diffs_metadata_entity.rb b/app/serializers/diffs_metadata_entity.rb index 8c226130f6e..ace5105dda5 100644 --- a/app/serializers/diffs_metadata_entity.rb +++ b/app/serializers/diffs_metadata_entity.rb @@ -6,7 +6,7 @@ class DiffsMetadataEntity < DiffsEntity DiffFileMetadataEntity.represent( diffs.raw_diff_files(sorted: true), options.merge( - conflicts: conflicts(allow_tree_conflicts: options[:allow_tree_conflicts]) + conflicts: (conflicts(allow_tree_conflicts: true) if options[:merge_conflicts_in_diff]) ) ) end |