From 20e60fa120b5b273e976bd601b03f33a78a2b941 Mon Sep 17 00:00:00 2001 From: Marius BALTEANU Date: Tue, 30 Mar 2021 12:24:46 +0300 Subject: [PATCH 16/19] Fix "DEPRECATION WARNING: Rendering actions with '.' in the name is deprecated: common/error_messages.api" (#29914, #34985) --- app/controllers/application_controller.rb | 2 +- app/controllers/repositories_controller.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 7ddf58a4c..b5644e89d 100644 --- 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.api', :status => :unprocessable_entity, :layout => nil + render :template => 'common/error_messages', :format => [: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 73929c1df..dfa96cc0e 100644 --- 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.html.erb' + render :diff, :formats => :html, :layout => 'base' end end -- 2.22.0