From 23288f62da73fb0e30d8e7ce306665e8fda1b932 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 29 Jan 2020 15:08:59 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/serializers/diffs_entity.rb | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'app/serializers/diffs_entity.rb') diff --git a/app/serializers/diffs_entity.rb b/app/serializers/diffs_entity.rb index 88e09ae8c0b..02f78180fb0 100644 --- a/app/serializers/diffs_entity.rb +++ b/app/serializers/diffs_entity.rb @@ -24,6 +24,10 @@ class DiffsEntity < Grape::Entity ) end + expose :context_commits, using: API::Entities::Commit, if: -> (diffs, options) { merge_request&.project&.context_commits_enabled? } do |diffs| + options[:context_commits] + end + expose :merge_request_diff, using: MergeRequestDiffEntity do |diffs| options[:merge_request_diff] end -- cgit v1.2.1