From 7e9c479f7de77702622631cff2628a9c8dcbc627 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 19 Nov 2020 08:27:35 +0000 Subject: Add latest changes from gitlab-org/gitlab@13-6-stable-ee --- app/serializers/paginated_diff_entity.rb | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'app/serializers/paginated_diff_entity.rb') diff --git a/app/serializers/paginated_diff_entity.rb b/app/serializers/paginated_diff_entity.rb index f24571f7d7d..fe59686278c 100644 --- a/app/serializers/paginated_diff_entity.rb +++ b/app/serializers/paginated_diff_entity.rb @@ -7,12 +7,19 @@ # class PaginatedDiffEntity < Grape::Entity include RequestAwareEntity + include DiffHelper 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), + conflicts: conflicts + ) + ) end expose :pagination do @@ -36,10 +43,6 @@ class PaginatedDiffEntity < Grape::Entity private - def code_navigation_path(diffs) - Gitlab::CodeNavigationPath.new(merge_request.project, diffs.diff_refs&.head_sha) - end - %i[current_page next_page total_pages].each do |method| define_method method do pagination_data[method] -- cgit v1.2.3