diff options
| author | Marius Balteanu <marius.balteanu@zitec.com> | 2022-10-02 11:49:11 +0000 |
|---|---|---|
| committer | Marius Balteanu <marius.balteanu@zitec.com> | 2022-10-02 11:49:11 +0000 |
| commit | bf161ee2335cc39c4e19ef72a9b4674f690d601a (patch) | |
| tree | d9441d367578eca12ef27ef73a29c92a713dcf09 /app | |
| parent | 396d855807b1ac73e9ab33f625bc626f647b3f4e (diff) | |
| download | redmine-bf161ee2335cc39c4e19ef72a9b4674f690d601a.tar.gz redmine-bf161ee2335cc39c4e19ef72a9b4674f690d601a.zip | |
Merge r21883-r21884 from trunk to 5.0-stable (#37626).
git-svn-id: https://svn.redmine.org/redmine/branches/5.0-stable@21885 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/repositories_controller.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb index ff1230c88..003fb3b6c 100644 --- a/app/controllers/repositories_controller.rb +++ b/app/controllers/repositories_controller.rb @@ -286,7 +286,8 @@ 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' + # ToDo: Fix DEPRECATION WARNING: Rendering actions with '.' in the name is deprecated + render :diff, :formats => :html, :layout => 'base.html.erb' end end |