From 869668c9cf93142083480a736e93af818ccdf8d6 Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Thu, 3 Aug 2017 16:27:19 +0200 Subject: [PATCH] Add render_error to blob JSON --- app/controllers/projects/blob_controller.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb index 7a8fad436ac..1716c8a7f61 100644 --- a/app/controllers/projects/blob_controller.rb +++ b/app/controllers/projects/blob_controller.rb @@ -58,10 +58,11 @@ class Projects::BlobController < Projects::ApplicationController simple_viewer: blob.simple_viewer&.class&.partial_name, rich_viewer: blob.rich_viewer&.class&.partial_name, show_viewer_switcher: !!blob.show_viewer_switcher?, + render_error: blob.simple_viewer&.render_error || blob.rich_viewer&.render_error, raw_path: project_raw_path(project, @id), blame_path: project_blame_path(project, @id), commits_path: project_commits_path(project, @id), - permalink: project_blob_path(project, File.join(@commit.id, @path)), + permalink: project_blob_path(project, File.join(@commit.id, @path)) ) end end