Skip to content

Commit

Permalink
add support for ruby 2.2
Browse files Browse the repository at this point in the history
  • Loading branch information
@rafaelss
rafaelss committed Dec 26, 2014
1 parent 8b48891 commit 26c235d
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion lib/safe_yaml.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# This needs to be defined up front in case any internal classes need to base
# their behavior off of this.
module SafeYAML
YAML_ENGINE = defined?(YAML::ENGINE) ? YAML::ENGINE.yamler : "syck"
YAML_ENGINE = defined?(YAML::ENGINE) ? YAML::ENGINE.yamler : (defined?(Psych) && YAML == Psych ? "psych" : "syck")
end

require "set"
Expand Down

2 comments on commit 26c235d

@CloCkWeRX
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any chance of a pull request for this to fix #76 ?

@bbasata
Copy link

@bbasata bbasata commented on 26c235d Jan 5, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@CloCkWeRX An identical change was merged and is available in version 1.0.4: 25e2e15

Please sign in to comment.