Merge branch 'andreaseger-fix_missing_require_of_active_support_json'

This commit is contained in:
Benjamin Fleischer
2016-04-04 13:52:16 -05:00
3 changed files with 2 additions and 1 deletions

View File

@@ -2,6 +2,7 @@ require 'active_model'
require 'active_support'
require 'active_support/core_ext/object/with_options'
require 'active_support/core_ext/string/inflections'
require 'active_support/json'
module ActiveModelSerializers
extend ActiveSupport::Autoload
autoload :Model