diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-15 09:10:00 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-15 09:10:00 +0000 |
| commit | a79324ad1f94b0c497a89c1ee35bd7d33f318008 (patch) | |
| tree | 51758517c955d805e343b5b640724964100219f9 /app/serializers/diffs_metadata_entity.rb | |
| parent | 4f33294e27e82f7d281c7ff7e390aa6c2ea32cb9 (diff) | |
| download | gitlab-ce-a79324ad1f94b0c497a89c1ee35bd7d33f318008.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 | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/serializers/diffs_metadata_entity.rb b/app/serializers/diffs_metadata_entity.rb index 8973f23734a..7b0de3bce4e 100644 --- a/app/serializers/diffs_metadata_entity.rb +++ b/app/serializers/diffs_metadata_entity.rb @@ -2,7 +2,9 @@ class DiffsMetadataEntity < DiffsEntity unexpose :diff_files - expose :raw_diff_files, as: :diff_files, using: DiffFileMetadataEntity + expose :diff_files, using: DiffFileMetadataEntity do |diffs, _| + diffs.raw_diff_files(sorted: true) + end expose :conflict_resolution_path do |_, options| presenter(options[:merge_request]).conflict_resolution_path |