From: Go MAEDA <maeda@farend.jp>
Date: Thu, 27 Feb 2020 01:22:06 +0000 (+0000)
Subject: Merged r19531 from trunk to 4.0-stable (#32449).
X-Git-Tag: 4.0.7~16
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=804f4f47727feef5922001fe32c6a2cd6d6b3b5b;p=redmine.git

Merged r19531 from trunk to 4.0-stable (#32449).


git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@19533 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index c467def29..a49beadc4 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -261,7 +261,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
+      render :diff, :formats => :html, :layout => 'base.html.erb'
     end
   end