diff --git a/app/controllers/devise_token_auth/application_controller.rb b/app/controllers/devise_token_auth/application_controller.rb index 6b197c98a..cb2985192 100644 --- a/app/controllers/devise_token_auth/application_controller.rb +++ b/app/controllers/devise_token_auth/application_controller.rb @@ -35,6 +35,8 @@ def resource_class(m=nil) def is_json_api return false unless defined?(ActiveModel::Serializer) + # 0.10.0 branch of ActiveModel:Serializer does not respond to :setup block. Use alternate syntax + return ActiveModel::Serializer.config.adapter == :json_api unless ActiveModel::Serializer.respond_to?(:setup) return ActiveModel::Serializer.setup do |config| config.adapter == :json_api end