summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* use dependency on hoeminitest5SHIBATA Hiroshi2014-12-051-2/+2
* added dev dependency of hoeSHIBATA Hiroshi2014-12-051-0/+1
* added configuration of minitest5SHIBATA Hiroshi2014-12-051-1/+3
* added minitest5 into travis envSHIBATA Hiroshi2014-12-051-0/+1
* remove warnings of Minitest5SHIBATA Hiroshi2014-12-052-2/+2
* 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
|/
* 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
|/
* * ext/psych/lib/psych/visitors/to_ruby.rb: backwards compatibility forAaron Patterson2014-08-053-0/+13
* backport r46948 from ruby/ruby trunk.SHIBATA Hiroshi2014-07-251-2/+0
* Manually reverted fa6aac2ab19762775fba78c264159efb4fcf3ecfSHIBATA Hiroshi2014-06-264-51/+4
* * ext/psych/lib/psych/visitors/yaml_tree.rb: dump empty symbols with aAaron Patterson2014-06-053-1/+19
* Revert "YAML::ENGINE was removed in [Bug #8344]"SHIBATA Hiroshi2014-05-254-4/+51
* YAML::ENGINE was removed in [Bug #8344]Zachary Scott2014-05-244-51/+4
* merge from ruby trunkSHIBATA Hiroshi2014-04-131-1/+1
* bumping up versionv2.0.5Aaron Patterson2014-03-271-1/+1
* Merge pull request #187 from tenderlove/libyaml-0.1.6Aaron Patterson2014-03-274-7/+17
|\
| * backport from libyaml-1.1.6SHIBATA Hiroshi2014-03-274-7/+17
|/
* * ext/psych/lib/psych/visitors/yaml_tree.rb: support dumping EncodingAaron Patterson2014-02-284-0/+24
* added 2.1.0 for travisSHIBATA Hiroshi2014-02-211-0/+1
* Merge branch 'backport-ruby-trunk'SHIBATA Hiroshi2014-02-215-14/+9
|\
| * backport from ruby trunkSHIBATA Hiroshi2014-02-215-14/+9
* | Merge pull request #186 from hsbt/backport-rubycoreAaron Patterson2014-02-182-3/+2
|\ \ | |/
| * remove unused variablesSHIBATA Hiroshi2014-02-182-3/+2
|/
* bumping versionv2.0.4Aaron Patterson2014-02-051-1/+1
* merge from ruby trunkAaron Patterson2014-02-058-38/+81
* * ext/psych/yaml/config.h: bump libyaml to 0.1.5Zachary Scott2014-02-052-4/+8
* bumping to 2.0.3v2.0.3Aaron Patterson2014-02-041-1/+1
* * ext/psych/yaml/emitter.c: merge libyaml 0.1.5Aaron Patterson2014-02-048-51/+101
* Merge pull request #180 from hsbt/fix-typoZachary Scott2014-01-182-2/+2
|\
| * fix typo at https://github.com/ruby/ruby/pull/500 and https://github.com/ruby...SHIBATA Hiroshi2014-01-192-2/+2
|/
* * ext/psych/lib/psych/visitors/yaml_tree.rb: dumping strings withAaron Patterson2014-01-083-1/+14
* merging ruby trunkAaron Patterson2014-01-082-2/+2
* Merge pull request #175 from benlangfeld/patch-1Aaron Patterson2013-12-191-0/+1
|\
View Lorry Controller Status