Merge pull request #1032 from elliotlarson/master

Wrap railtie requirement with rescue
This commit is contained in:
João Moura 2015-08-01 17:22:12 -03:00
commit 9ace77e655

View File

@ -2,10 +2,10 @@ require 'active_model'
require 'active_model/serializer/version'
require 'active_model/serializer'
require 'active_model/serializer/fieldset'
require 'active_model/serializer/railtie'
require 'active_model/serializable_resource'
begin
require 'active_model/serializer/railtie'
require 'action_controller'
require 'action_controller/serialization'