summaryrefslogtreecommitdiff
Commit message (Collapse)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"
| * 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.load
| * Document symbolize_names keyword argument of Psych.loadMarcus Stollsteimer2017-11-281-0/+7
|/
* Picked r60919SHIBATA Hiroshi2017-11-271-3/+3
| | | | https://github.com/ruby/ruby/commit/2d9f20e1cfdc7532a8acef4da9b8b7a788c4e99a
* 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
| | | | | | | | | | | * https://github.com/ruby/ruby/commit/1852b4a8660ee8e71997f81cee4903c6eb23f306 * https://github.com/ruby/ruby/commit/c70f12c288cec94d3a7079ee3ffac3ee606d29ff * https://github.com/ruby/ruby/commit/4911d45648d03a519a3c93ca04649705a10fe149 * https://github.com/ruby/ruby/commit/af14720f749ea0274cadd4fa0329b86567ae0057 * https://github.com/ruby/ruby/commit/e3b4cd38dfe6df2545bf7a3dee01f9b4a78e94d0 * https://github.com/ruby/ruby/commit/1493972e8234cd5d57881d2353d153aa7cd67e72 * https://github.com/ruby/ruby/commit/208d2a95f5cceeeec0f619e4700bb6971e41f677 * https://github.com/ruby/ruby/commit/865decb508e89960382fc41d239be3e42545b68a
* Merge pull request #333 from k0kubun/symbolize_namesSHIBATA Hiroshi2017-11-272-2/+35
|\ | | | | Add :symbolize_names option to Psych.load like JSON.parse
| * Add :symbolize_names option to Psych.loadTakashi Kokubun2017-11-252-2/+35
|/ | | | like JSON.parse.
* Merge pull request #332 from pocke/ciAkira Matsuda2017-10-271-3/+3
|\ | | | | CI against Ruby 2.4.2, 2.3.5 and 2.2.8
| * 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 documentation
| * 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 only
| * Double quote stings that contain single quotes onlyWolfgang Teuber2017-07-212-1/+8
| | | | | | | | Fixes #324
* | Merge pull request #326 from asterite/feature/scalar_locationAaron Patterson2017-09-107-22/+175
|\ \ | | | | | | Add Psych::Handler#event_location
| * | Add location information to Psych::Nodes::NodeAry Borenszweig2017-08-023-4/+70
| | |
| * | Add Psych::Handler#event_locationAry Borenszweig2017-08-024-18/+105
| |/ | | | | | | | | | | This adds a new reported event to Psych::Handler, event_location, with precise start/end line/column information. The line/column information provided by Psych::Parser#mark is not very useful because it points to the location past the event.
* | 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…
| * Parse.load with an IO/File which has a non-YAML allowed encoding will justThomas E. Enebo2017-09-052-0/+19
|/ | | | | | | | | | | | | | | set the encoding to UTF-8 and hope for the best. This appears to be how libyaml works. This issue was noticed in yaml/store because it extends pstore which will create an IO in read_only mode as: ```ruby RD_ACCESS = {mode: IO::RDONLY | IO::BINARY, encoding: Encoding::ASCII_8BIT} ``` The data in the test case I was debugging was in fact UTF-8 data and MRI was happy to take this 8bit IO and pretend it is UTF-8. Form-fitting ftw.
* 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
|\ | | | | Cross Compilation task for mingw platform
| * 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
|\ | | | | Make frozen string literal = true
| * Merge branch 'master' into frozenSHIBATA Hiroshi2017-06-305-16/+25
| |\ | |/ |/|
* | Support enumerator objectsAaron Patterson2017-06-292-3/+13
| | | | | | | | Fixes #277
* | Rely on encoding tags to determine if string should be dumped as binaryAaron Patterson2017-06-294-13/+12
| | | | | | | | | | | | If a string is tagged as binary, then we should dump it as binary. Fixes #278
| * 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
| * 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
| | | | | | | | Fixes #319.
* | Merge pull request #316 from stomar/timezone-offsetAaron Patterson2017-05-222-1/+32
|\ \ | | | | | | Preserve time zone offset when deserializing times
| * | Preserve time zone offset when deserializing timesMarcus Stollsteimer2017-05-222-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix support of time zone offsets. Now the time zone offset will be preserved when times are deserialized from YAML with a specified offset. Previously, times other than UTC ("Z") where converted to local time. The test cases use two different offsets to account for the possibility of an erratic success when the tests are run in the corresponding time zone.
| * | Add tests for time with usec and with time zone offsetMarcus Stollsteimer2017-05-221-0/+15
|/ / | | | | | | | | | | | | Add test cases for times with nonzero usec, and for times other than UTC. Note that in the latter case the test only ensures that the restored time designates the same point in time, not that is has the same time zone offset.
* | Merge pull request #317 from junaruga/feature/update-travisSHIBATA Hiroshi2017-05-111-3/+3
|\ \ | | | | | | Update .travis.yml
| * | Update .travis.ymlJun Aruga2017-05-101-3/+3
|/ /
* | Merge pull request #312 from ruby/remove-deprecated-methodsSHIBATA Hiroshi2017-04-0511-309/+7
|\ \ | | | | | | Remove deprecated methods
| * | 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
| | |
View Lorry Controller Status