diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-27 15:08:39 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-27 15:08:39 +0000 |
| commit | 2b1e7f7dac0fa5d7bb3bdf415cec1b3c67ed77b0 (patch) | |
| tree | 725ae8200573957bff6fa03aee237f738dadf1d7 /app/serializers | |
| parent | eb004dc626d3a1c9497e8b9dc0f3f578afd05fd9 (diff) | |
| download | gitlab-ce-2b1e7f7dac0fa5d7bb3bdf415cec1b3c67ed77b0.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/serializers')
| -rw-r--r-- | app/serializers/paginated_diff_entity.rb | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/app/serializers/paginated_diff_entity.rb b/app/serializers/paginated_diff_entity.rb index f24571f7d7d..1d72f970c49 100644 --- a/app/serializers/paginated_diff_entity.rb +++ b/app/serializers/paginated_diff_entity.rb @@ -11,8 +11,13 @@ class PaginatedDiffEntity < Grape::Entity expose :diff_files do |diffs, options| submodule_links = Gitlab::SubmoduleLinks.new(merge_request.project.repository) - DiffFileEntity.represent(diffs.diff_files, - options.merge(submodule_links: submodule_links, code_navigation_path: code_navigation_path(diffs))) + DiffFileEntity.represent( + diffs.diff_files, + options.merge( + submodule_links: submodule_links, + code_navigation_path: code_navigation_path(diffs) + ) + ) end expose :pagination do |