Merge pull request #648 from bvandgrift/master

updates config wrapper to conform with newer idiom
lynndylanhurley · May 30, 2016 · a1e5143 · a1e5143
2 parents 1d6dbdc + 7b97279
commit a1e5143
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/app/controllers/devise_token_auth/application_controller.rb b/app/controllers/devise_token_auth/application_controller.rb
@@ -35,7 +35,9 @@ def resource_class(m=nil)
 
     def is_json_api
       return false unless defined?(ActiveModel::Serializer)
-      return ActiveModel::Serializer.config.adapter == :json_api
+      return ActiveModel::Serializer.setup do |config|
+        config.adapter == :json_api
+      end
     end
 
   end