summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jruby' of github.com:tenderlove/psych into jrubyv2.0.14jrubyAaron Patterson2015-08-213-3/+4
|\
| * Merge pull request #237 from mkristian/no-jruby-depAaron Patterson2015-08-213-3/+4
| |\
| | * no need to supply jruby itself to the classpathChristian Meier2015-05-283-3/+4
| |/
* | Merge branch 'master' into jrubyAaron Patterson2015-08-214-8/+8
|\ \ | |/ |/|
| * Merge pull request #233 from miketheman/update_minitest_verisonSHIBATA Hiroshi2015-06-282-3/+4
| |\
| | * update minitest gem to 5.x, add Ruby 2.2 test targetMike Fiedler2015-05-032-3/+4
| * | Merge pull request #238 from nobu/potential_memory_leakSHIBATA Hiroshi2015-05-292-5/+4
| |\ \ | | |/ | |/|
| | * psych: allocate structs with wrappernobu2015-05-292-5/+4
| |/
* | bumping versionAaron Patterson2015-05-271-1/+1
* | Merge pull request #235 from mkristian/snakeyaml-propertyAaron Patterson2015-05-062-4/+3
|\ \
| * | little ruby-maven related improvementsChristian Meier2015-05-062-4/+3
|/ /
* | Default to UTF-8 when encoding does not appear to be unicode.Charles Oliver Nutter2015-05-051-4/+9
* | bumping to 2.0.14.pre1Aaron Patterson2015-05-051-1/+1
* | don't add the jar file to the manifestAaron Patterson2015-04-292-2/+19
* | Merge branch 'master' into jrubyAaron Patterson2015-04-292-2/+9
|\ \ | |/
| * Merge pull request #229 from filialpails/patch-1Aaron Patterson2015-03-302-2/+9
| |\
| | * add testfilialpails2015-03-301-0/+7
| | * don't assume any tag starting with 'str' is a stringRob Steward2015-03-301-2/+2
| |/
* | Merge branch 'master' into jrubyAaron Patterson2015-03-0312-77/+195
|\ \ | |/
| * Merge pull request #224 from bjfish/patch-1Aaron Patterson2015-02-231-0/+4
| |\
| | * Adding Rubinius as an Allowed FailureBrandon Fish2015-02-221-0/+3
| | * Adding RVM listing for RubiniusBrandon Fish2015-02-141-0/+1
| * | bump versionv2.0.13Aaron Patterson2015-02-171-1/+1
| * | Merge pull request #225 from flori/fix-cve-2014-9130Aaron Patterson2015-02-171-7/+0
| |\ \ | | |/ | |/|
| | * Fix CVE-2014-9130Florian Frank2015-02-171-7/+0
| |/
| * fix minitest warningsAaron Patterson2015-02-062-2/+8
| * * ext/psych/lib/psych/visitors/yaml_tree.rb: register nodes whenAaron Patterson2015-02-063-3/+33
| * * ext/psych/lib/psych/visitors/to_ruby.rb: fix support for regularAaron Patterson2015-02-063-2/+13
| * * ext/psych/lib/psych/visitors/to_ruby.rb: fix parsing hashes withv2.0.12Aaron Patterson2015-01-284-1/+17
| * bump versionv2.0.11Aaron Patterson2015-01-201-1/+1
| * Merge pull request #221 from nobu/fix-anchorAaron Patterson2015-01-172-9/+17
| |\
| | * Fix anchorNobuyoshi Nakada2015-01-172-9/+17
| | * Fix assertion regexpsNobuyoshi Nakada2015-01-171-2/+2
| |/
| * bump versionv2.0.10Aaron Patterson2015-01-161-1/+1
| * Merge pull request #218 from jemc/masterAaron Patterson2015-01-162-44/+48
| |\
| | * Only dump ivars for subclasses of String, not for String.Joe Eli McIlvain2015-01-151-4/+5
| | * Only dump ivars for subclasses of Hash, not for Hash.Joe Eli McIlvain2015-01-152-40/+43
| |/
| * Merge pull request #215 from jirutka/patch-2Aaron Patterson2015-01-132-18/+64
| |\
| | * Fix block chomping and add more testsJakub Jirutka2015-01-132-9/+30
| | * Preset @line_width in YAMLTree#initialize for better performanceJakub Jirutka2015-01-121-12/+9
| | * Use appropriate style for serialized stringsJakub Jirutka2015-01-122-5/+34
| | * Remove unnnecessary 'str' variable in YAMLTree#visit_StringJakub Jirutka2015-01-121-4/+3
| |/
* | setup java platform gemChristian Meier2015-02-268-12/+55
* | Merge remote-tracking branch 'origin/master' into jrubyCharles Oliver Nutter2015-01-0996-518/+15063
|\ \ | |/
| * bumping version:v2.0.9Aaron Patterson2015-01-081-1/+1
| * Merge branch 'master' into jirutka-patch-1Aaron Patterson2015-01-0821-47/+367
| |\
| | * * ext/psych/lib/psych/visitors/to_ruby.rb: call `allocate` on hashAaron Patterson2015-01-083-2/+37
| | * * ext/psych/lib/psych/visitors/to_ruby.rb: revive hashes with ivarsAaron Patterson2015-01-084-8/+76
| | * Merge pull request #213 from hsbt/ruby-headAaron Patterson2014-12-062-3/+6
| | |\
| | | * removed isolate taskSHIBATA Hiroshi2014-12-061-1/+1