summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Support YAML 1.2 Core Schema. Addressed https://bugs.ruby-lang.org/issues/11988issue-11988SHIBATA Hiroshi2016-02-092-1/+7
* update travis configurationSHIBATA Hiroshi2016-01-221-2/+4
* bump version to 2.0.17v2.0.17SHIBATA Hiroshi2015-12-221-1/+1
* Merge pull request #261 from tenderlove/backport-ruby-trunkAaron Patterson2015-12-211-4/+8
|\
| * backport revision r53078 and r53079 from ruby/ruby.SHIBATA Hiroshi2015-12-221-4/+8
|/
* updating psych to 2.0.16v2.0.16Aaron Patterson2015-12-071-1/+1
* Merge pull request #255 from glebm/line_widthAaron Patterson2015-12-072-1/+19
|\
| * Fixes line_width: -1 handling #254Gleb Mazovetskiy2015-11-141-0/+8
| * Add a failing test for line width #254Gleb Mazovetskiy2015-11-141-1/+11
|/
* backword compatibility of Ruby 2.0.0SHIBATA Hiroshi2015-11-081-0/+7
* merge r52447, r52448 and r52453 from ruby/ruby trunkSHIBATA Hiroshi2015-11-061-4/+4
* Merge pull request #249 from jrafanie/reduce_string_allocationsAaron Patterson2015-09-161-1/+2
|\
| * Use a constant to avoid thousands of String allocations of "<<".Joe Rafaniello2015-09-161-1/+2
|/
* Merge pull request #245 from hsbt/remove-19-supportSHIBATA Hiroshi2015-09-125-35/+14
|\
| * fix comments for Ruby 1.9SHIBATA Hiroshi2015-09-121-1/+1
| * removed EOL rubiesSHIBATA Hiroshi2015-08-271-3/+1
| * removed Ruby 1.9 supportSHIBATA Hiroshi2015-08-273-31/+12
* | Merge pull request #248 from sandersch/charlie/uknown-to-evilSHIBATA Hiroshi2015-09-101-1/+1
|\ \
| * | Fix spelling typo: uknown -> unknownCharlie Sanders2015-09-091-1/+1
|/ /
* | Merge pull request #246 from yyamano/fix-dumpSHIBATA Hiroshi2015-09-022-0/+13
|\ \ | |/ |/|
| * Fix Encoding::UndefinedConversionError when dumping non ascii string to a file.Yuji Yamano2015-08-272-0/+13
|/
* bumping versionv2.0.15Aaron Patterson2015-08-211-1/+1
* If incoming string is not unicode, transcode to UTF-8.Charles Oliver Nutter2015-08-211-4/+11
* Merge pull request #242 from josephbisch/omapAaron Patterson2015-08-211-1/+1
|\
| * Fix omap to be !!omap instead of !omapJoseph Bisch2015-07-101-1/+1
* | 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
| |/