Remove rescue block to require psych gem #4298

Merged
merged 8 commits into from Jan 4, 2012

Projects

None yet

3 participants

@rafaelfranca
Member

I'm also removed the check if the YAML::ENGINE constant is defined

Rafael Mendo... added some commits Jan 4, 2012
@spastorino
Member

@rafaelfranca nice pull request but YAML::ENGINE.syck? is always false, you can remove everything there

@rafaelfranca
Member

Ok. I think that some place where we require psych is not needed because when we require yaml the psych is already loaded. I will remove this too.

>> require 'yaml'
=> true
>> require 'psych'
=> false
@rafaelfranca
Member
@tenderlove tenderlove merged commit cf32a59 into rails:master Jan 4, 2012
@tenderlove tenderlove merged commit 7d26fad into rails:master Jan 4, 2012
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment