summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
|\
| * Psych.safe_load relies on ClassLoader without explicit dependencyBen Langfeld2013-12-191-0/+1
|/
* Merge pull request #172 from splattael/struct-refAaron Patterson2013-12-132-1/+7
|\
| * Fix references for anonymous structsPeter Suschlik2013-12-051-1/+3
| * Add failing test for Struct referencesPeter Suschlik2013-12-051-0/+4
* | Merge pull request #173 from amatsuda/preceededAaron Patterson2013-12-131-4/+4
|\ \ | |/ |/|
| * fix typoAkira Matsuda2013-12-111-4/+4
|/
* bumping versionv2.0.2Aaron Patterson2013-11-261-1/+1
* fix support for negative years.Aaron Patterson2013-11-264-3/+24
* fix regexp for matching TIME.Aaron Patterson2013-11-263-1/+12
* * ext/psych/lib/psych/visitors/to_ruby.rb: process merge keys beforeAaron Patterson2013-11-053-9/+30
* * ext/psych/lib/psych/visitors/yaml_tree.rb: make less garbage whenAaron Patterson2013-10-292-7/+16
* * ext/psych/lib/psych/visitors/yaml_tree.rb: string subclasses shouldAaron Patterson2013-10-293-2/+16
* Merge branch 'master' of github.com:tenderlove/psychAaron Patterson2013-10-293-1/+7
|\
| * Merge pull request #164 from bf4/add_license_to_gemspecAaron Patterson2013-10-151-0/+1
| |\
| | * [#163] Add license to gemspec, is MITBenjamin Fleischer2013-10-091-0/+1
| |/
| * * ext/psych/yaml/yaml.h: [DOC] fix typo by @GreenGeorge [Fixes GH-161]Zachary Scott2013-09-202-1/+6
* | bumping to 2.0.1v2.0.1Aaron Patterson2013-09-181-1/+1
|/
* * ext/psych/lib/psych/visitors/yaml_tree.rb: use double quotes whenAaron Patterson2013-09-053-0/+15
* backport Tempfile.create so psych tests will run outside ruby trunkAaron Patterson2013-08-281-0/+29
* * ext/psych/lib/psych/scalar_scanner.rb: invalid floats should beAaron Patterson2013-08-283-1/+14
* merge ruby/ruby@826df7f upstreamZachary Scott2013-07-184-8/+8
* * ext/psych/lib/psych/visitors/yaml_tree.rb: register time objects soAaron Patterson2013-07-053-1/+15
* merging from ruby trunkAaron Patterson2013-07-052-1/+10
* Replace outdated ruby-head with 2.0.0 on travisEric Hodel2013-06-281-1/+1
* updating manifestv2.0.0Aaron Patterson2013-06-271-0/+4
* * ext/psych/lib/psych.rb: Adding Psych.safe_load for loading a userAaron Patterson2013-05-1419-60/+383
* merge from RubyAaron Patterson2013-05-144-5/+36
* merging from RubyAaron Patterson2013-05-144-80/+74
* Merge pull request #141 from kdisneur/fix/remove_swp_filesAaron Patterson2013-05-141-0/+0
|\
| * Remove remaining .swp fileKevin2013-04-261-0/+0
* | Merge pull request #131 from sheerun/fix/namingAaron Patterson2013-05-141-3/+3
|\ \
| * | Do not use one-letter variablesAdam Stankiewicz2013-02-271-3/+3
* | | Update rbx install docsZachary Scott2013-04-271-2/+3
| |/ |/|
* | Merge pull request #122 from tjwallace/fix_coder_emit_hashAaron Patterson2013-04-052-3/+3
|\ \
| * | Fix case when map includes a symbol key in #emit_coderJeff Wallace2013-01-302-3/+3
* | | change test name to be more helpful. fixes #124Aaron Patterson2013-04-051-2/+2
* | | * ext/psych/lib/psych/exception.rb: there should be only one exceptionAaron Patterson2013-04-055-10/+19
* | | * ext/psych/lib/psych/visitors/to_ruby.rb: correctly registerAaron Patterson2013-04-053-7/+49
* | | sync with ruby trunkAaron Patterson2013-04-0538-63/+59
* | | * lib/psych.rb: specify in rdoc what object is returned in parserZachary Scott2013-02-282-4/+9