diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index ccc728f60..32dae9812 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -30,7 +30,7 @@ class ApplicationController < ActionController::Base return end - if request.format.json? || request.format.xml? + if subject.respond_to?(:includes) && (request.format.json? || request.format.xml?) associations = ParameterBuilder.includes_parameters(params[:only], model_name) subject = subject.includes(associations) end