Reverts r20895 (#29914, #34985).

Wrong issue number.

git-svn-id: http://svn.redmine.org/redmine/trunk@20896 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index b5644e89dd6f62f8b561b297a5701ccea84fe04d..7ddf58a4cce94aece34a732d4e26d0532b4cfc79 100644 (file)
--- 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 dfa96cc0ea8f3ccaef159044ae5a078801a800b9..73929c1dfb3ee58e4a7e87b0946fa8a1205d7fb2 100644 (file)
--- 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