0016-Fix-DEPRECATION-WARNING-Rendering-actions-with-.-in-.patch

Marius BALTEANU, 2021-03-30 18:42

Download (1.8 KB)

View differences:

app/controllers/application_controller.rb
744 744

  
745 745
  def render_api_errors(*messages)
746 746
    @error_messages = messages.flatten
747
    render :template => 'common/error_messages.api', :status => :unprocessable_entity, :layout => nil
747
    render :template => 'common/error_messages', :format => [:api], :status => :unprocessable_entity, :layout => nil
748 748
  end
749 749

  
750 750
  # Overrides #_include_layout? so that #render with no arguments
app/controllers/repositories_controller.rb
286 286
      @changeset = @repository.find_changeset_by_name(@rev)
287 287
      @changeset_to = @rev_to ? @repository.find_changeset_by_name(@rev_to) : nil
288 288
      @diff_format_revisions = @repository.diff_format_revisions(@changeset, @changeset_to)
289
      render :diff, :formats => :html, :layout => 'base.html.erb'
289
      render :diff, :formats => :html, :layout => 'base'
290 290
    end
291 291
  end
292 292

  
293
-