meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2026-02-01 03:57:15 +00:00
Code Issues Releases Wiki Activity

Reverts r20895 (#29914, #34985).

Browse Source 
Wrong issue number.


git-svn-id: http://svn.redmine.org/redmine/trunk@20896 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA 2021-04-01 15:34:21 +00:00
parent d67eeabd53
commit a7b96ae2ab
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/application_controller.rb
View File

@ -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

2
app/controllers/repositories_controller.rb
View File

@ -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