summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Revert "Revert "Double quote stings that contain single quotes only""revert-335-revert-325-fix_324SHIBATA Hiroshi2017-11-292-1/+8
* Merge pull request #335 from ruby/revert-325-fix_324SHIBATA Hiroshi2017-11-292-8/+1
|\
| * Revert "Double quote stings that contain single quotes only"SHIBATA Hiroshi2017-11-292-8/+1
|/
* Merge pull request #334 from stomar/doc_symbolize_namesSHIBATA Hiroshi2017-11-291-0/+7
|\
| * Document symbolize_names keyword argument of Psych.loadMarcus Stollsteimer2017-11-281-0/+7
|/
* Picked r60919SHIBATA Hiroshi2017-11-271-3/+3
* Bump version to 3.0.0.beta4v3.0.0.beta4SHIBATA Hiroshi2017-11-272-3/+3
* Merge commits from ruby core repository.SHIBATA Hiroshi2017-11-275-28/+22
* Merge pull request #333 from k0kubun/symbolize_namesSHIBATA Hiroshi2017-11-272-2/+35
|\
| * Add :symbolize_names option to Psych.loadTakashi Kokubun2017-11-252-2/+35
|/
* Merge pull request #332 from pocke/ciAkira Matsuda2017-10-271-3/+3
|\
| * CI against Ruby 2.4.2, 2.3.5 and 2.2.8Masataka Pocke Kuwabara2017-10-271-3/+3
|/
* Merge pull request #330 from petekinnecom/fixupDocAaron Patterson2017-10-061-4/+5
|\
| * Fixup Recorder example documentationPete Kinnecom2017-09-211-4/+5
|/
* Use JRuby 9.1.13.0SHIBATA Hiroshi2017-09-151-2/+2
* Removed trailing white-spaces.SHIBATA Hiroshi2017-09-121-1/+1
* Merge pull request #325 from knugie/fix_324SHIBATA Hiroshi2017-09-112-1/+8
|\
| * Double quote stings that contain single quotes onlyWolfgang Teuber2017-07-212-1/+8
* | Merge pull request #326 from asterite/feature/scalar_locationAaron Patterson2017-09-107-22/+175
|\ \
| * | Add location information to Psych::Nodes::NodeAry Borenszweig2017-08-023-4/+70
| * | Add Psych::Handler#event_locationAry Borenszweig2017-08-024-18/+105
| |/
* | Merge pull request #328 from enebo/desensitize_io_encoding_on_loadCharles Oliver Nutter2017-09-072-0/+19
|\ \ | |/ |/|
| * Parse.load with an IO/File which has a non-YAML allowed encoding will justThomas E. Enebo2017-09-052-0/+19
|/
* bump version to 3.0.0.beta3v3.0.0.beta3SHIBATA Hiroshi2017-07-142-2/+2
* Merge pull request #321 from ruby/crossSHIBATA Hiroshi2017-07-134-6/+47
|\
| * Fixed path for mingw binarycrossSHIBATA Hiroshi2017-07-121-1/+1
| * only evaluate gemspec for cross copilationSHIBATA Hiroshi2017-07-121-3/+2
| * Added psych binary for fat gem on mingw platformSHIBATA Hiroshi2017-07-121-0/+3
| * Added cross compilation task for mingw platformSHIBATA Hiroshi2017-07-123-9/+16
| * ignored so binary typeSHIBATA Hiroshi2017-07-121-0/+1
| * Added rake-compiler-dock for mingw buildsSHIBATA Hiroshi2017-07-123-0/+10
| * styleSHIBATA Hiroshi2017-07-121-2/+23
|/
* Merge pull request #320 from ruby/frozenSHIBATA Hiroshi2017-06-3085-90/+91
|\
| * Merge branch 'master' into frozenSHIBATA Hiroshi2017-06-305-16/+25
| |\ | |/ |/|
* | Support enumerator objectsAaron Patterson2017-06-292-3/+13
* | Rely on encoding tags to determine if string should be dumped as binaryAaron Patterson2017-06-294-13/+12
| * make frozen_string_literal: truefrozenSHIBATA Hiroshi2017-06-1985-91/+92
|/
* bump version to 3.0.0.beta2v3.0.0.beta2SHIBATA Hiroshi2017-06-162-3/+3
* Merge pull request #158 from laserlemon/delegatorsSHIBATA Hiroshi2017-06-162-0/+19
|\
| * Enable YAML serialization of Ruby delegators and simple delegatorsSteve Richert2013-11-262-0/+19
* | Fall back on UTF-8 when an IO-like object's Charset isn't found.Charles Oliver Nutter2017-05-311-4/+9
* | Merge pull request #316 from stomar/timezone-offsetAaron Patterson2017-05-222-1/+32
|\ \
| * | Preserve time zone offset when deserializing timesMarcus Stollsteimer2017-05-222-1/+17
| * | Add tests for time with usec and with time zone offsetMarcus Stollsteimer2017-05-221-0/+15
|/ /
* | Merge pull request #317 from junaruga/feature/update-travisSHIBATA Hiroshi2017-05-111-3/+3
|\ \
| * | Update .travis.ymlJun Aruga2017-05-101-3/+3
|/ /
* | Merge pull request #312 from ruby/remove-deprecated-methodsSHIBATA Hiroshi2017-04-0511-309/+7
|\ \
| * | Fixed gabage linesremove-deprecated-methodsSHIBATA Hiroshi2017-03-273-47/+0
| * | Removed to_yaml support on YAMLTreeSHIBATA Hiroshi2017-03-271-0/+3
| * | Removed override methodSHIBATA Hiroshi2017-03-271-9/+0