Merge pull request lynndylanhurley#651 from woodcrust/woodcrust

fix method 'is_json_api' with active_model_serialier v 0.10.0
Jylth · Jun 2, 2016 · bc04747 · bc04747
2 parents b892e1b + 316cece
commit bc04747
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/app/controllers/devise_token_auth/application_controller.rb b/app/controllers/devise_token_auth/application_controller.rb
@@ -37,7 +37,8 @@ def is_json_api
       return false unless defined?(ActiveModel::Serializer)
       return ActiveModel::Serializer.setup do |config|
         config.adapter == :json_api
-      end
+      end if ActiveModel::Serializer.respond_to?(:setup)
+      return ActiveModelSerializers.config.adapter == :json_api
     end
 
   end