From: Go MAEDA <maeda@farend.jp>
Date: Thu, 27 Feb 2020 01:21:03 +0000 (+0000)
Subject: Merged r19531 from trunk to 4.1-stable (#32449).
X-Git-Tag: 4.1.1~40
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f2524eb07542a2c30dcce494aeab491f80b4c00e;p=redmine.git

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


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

diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index 6994eb294..ef903f251 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -263,7 +263,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