From a7b96ae2ab2b94df3e33e9f3f8e58384503be3bf Mon Sep 17 00:00:00 2001 From: Go MAEDA Date: Thu, 1 Apr 2021 15:34:21 +0000 Subject: [PATCH] Reverts r20895 (#29914, #34985). Wrong issue number. git-svn-id: http://svn.redmine.org/redmine/trunk@20896 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/controllers/application_controller.rb | 2 +- app/controllers/repositories_controller.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index b5644e89d..7ddf58a4c 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -744,7 +744,7 @@ class ApplicationController < ActionController::Base def render_api_errors(*messages) @error_messages = messages.flatten - render :template => 'common/error_messages', :format => [:api], :status => :unprocessable_entity, :layout => nil + render :template => 'common/error_messages.api', :status => :unprocessable_entity, :layout => nil end # Overrides #_include_layout? so that #render with no arguments diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb index dfa96cc0e..73929c1df 100644 --- a/app/controllers/repositories_controller.rb +++ b/app/controllers/repositories_controller.rb @@ -286,7 +286,7 @@ class RepositoriesController < ApplicationController @changeset = @repository.find_changeset_by_name(@rev) @changeset_to = @rev_to ? @repository.find_changeset_by_name(@rev_to) : nil @diff_format_revisions = @repository.diff_format_revisions(@changeset, @changeset_to) - render :diff, :formats => :html, :layout => 'base' + render :diff, :formats => :html, :layout => 'base.html.erb' end end -- 2.39.5