summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * 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
| | | * removed isolate pluginSHIBATA Hiroshi2014-12-062-2/+1
| | | * added minitest dependency into gemspecSHIBATA Hiroshi2014-12-061-0/+2
| | | * added install task into travisSHIBATA Hiroshi2014-12-061-0/+1
| | | * added ruby-head envSHIBATA Hiroshi2014-12-061-0/+1
| | |/
| | * bumping version to 2.0.8v2.0.8SHIBATA Hiroshi2014-12-051-1/+1
| | * Merge pull request #211 from tenderlove/fix-type-dataAaron Patterson2014-12-022-0/+4
| | |\
| | | * fixed build error caused by trunk changesfix-type-dataSHIBATA Hiroshi2014-12-022-0/+4
| | |/
| | * bumping version to 2.0.7v2.0.7Aaron Patterson2014-12-011-1/+1
| | * merging from ruby trunkAaron Patterson2014-12-015-26/+58
| | * Merge branch 'master' of github.com:tenderlove/psychAaron Patterson2014-12-017-4/+93
| | |\
| | | * backport r48512 from ruby/ruby trunk.SHIBATA Hiroshi2014-11-232-2/+2
| | | * Add changelog for 2a4d9568f7d5d19c00231cf48eb855cc45ec3394Zachary Scott2014-11-221-0/+7
| | | * backport r48214 from ruby/ruby trunk.SHIBATA Hiroshi2014-11-021-2/+1
| | | * Merge pull request #205 from sgrif/sg-simple-delegatorAaron Patterson2014-09-173-0/+83
| | | |\
| | | | * Allow dumping any BasicObject that defines #marshal_dump or #marshal_loadSean Griffin2014-09-173-0/+83
| | | |/
| | * | bumping versionv2.0.6Aaron Patterson2014-09-131-1/+1
| | |/
| | * * ext/psych/lib/psych/visitors/yaml_tree.rb: fix NameError dumping andAaron Patterson2014-08-293-0/+31
| | * * ext/psych/lib/psych/scalar_scanner.rb: fix loading strings thatAaron Patterson2014-08-293-1/+11
| | * * ext/psych/lib/psych/visitors/to_ruby.rb: merge keys with a hashAaron Patterson2014-08-293-1/+17
| | * * ext/psych/lib/psych/visitors/to_ruby.rb: quoted "<<" stringsAaron Patterson2014-08-294-1/+34
| | * Merge pull request #201 from lfzawacki/remove-test-engine-managerAaron Patterson2014-08-201-1/+0
| | |\
| | | * Remove test_engine_manager.rb from Manifest.txtLucas Zawacki2014-08-201-1/+0
| | |/
| * | Don't quote scalar values beginning with non-ASCII characterJakub Jirutka2014-08-162-1/+7
| |/
| * Merge pull request #199 from mjtko/fix/yaml-registrar-mappingsAaron Patterson2014-08-061-0/+2
| |\
| | * Retain reference to target in Registrar so a GC run can't confuse ongoing ser...Mark J. Titorenko2014-08-061-0/+2
| |/