diff options
Diffstat (limited to 'app/controllers/projects/merge_requests/diffs_controller.rb')
| -rw-r--r-- | app/controllers/projects/merge_requests/diffs_controller.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/controllers/projects/merge_requests/diffs_controller.rb b/app/controllers/projects/merge_requests/diffs_controller.rb index c0c8474232a..72e76f56540 100644 --- a/app/controllers/projects/merge_requests/diffs_controller.rb +++ b/app/controllers/projects/merge_requests/diffs_controller.rb @@ -64,6 +64,10 @@ class Projects::MergeRequests::DiffsController < Projects::MergeRequests::Applic options = additional_attributes.merge(diff_view: diff_view) + if @merge_request.project.context_commits_enabled? + options[:context_commits] = @merge_request.context_commits + end + render json: DiffsSerializer.new(request).represent(diffs, options) end |