summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Properly negotiate encoding from string or IO.atambo-native_jrubyCharles Oliver Nutter2013-08-281-20/+97
* Use read encoding from IO to set up parser's reader.Charles Oliver Nutter2013-08-281-0/+7
* Use UnsafeHolder, since UnsafeFactory is gone in 1.7.5+.Charles Oliver Nutter2013-08-281-2/+2
* the space is not requiredAaron Patterson2013-08-281-2/+2
* Merge branch 'master' into atambo-native_jrubyAaron Patterson2013-08-2811-11/+81
|\
| * 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
* | Add native jruby support to psych. Fixes #145Alex Tambellini2013-06-2310-9/+996
|/
* * 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
* | | * lib/psych.rb: rdoc for Psych overview by Adam StankiewiczZachary Scott2013-02-282-26/+152
| |/ |/|
* | Missed author from 706545cZachary Scott2013-02-161-1/+2
* | * lib/psych/y.rb: Document Kernel#y [Github Fixes #127]Zachary Scott2013-02-162-0/+6
* | * ext/psych/lib/psych/visitors/yaml_tree.rb: fixing string quotationAaron Patterson2013-02-074-11/+28
* | * ext/psych/lib/psych/visitors/yaml_tree.rb: change output referenceAaron Patterson2013-02-072-5/+34
* | sync with ruby trunkAaron Patterson2013-02-061-0/+1
|/
* * ext/psych/lib/psych/scalar_scanner.rb: use constants rather thanAaron Patterson2013-01-162-3/+8
* * ext/psych/yaml/scanner.c: Typos by James Dabbs [Github Fixes #118]Zachary Scott2013-01-132-17/+21
* * ext/psych/lib/psych/visitors/to_ruby.rb: merge key values thatAaron Patterson2013-01-113-6/+78
* * ext/psych/lib/psych/scalar_scanner.rb: strip trailing dots fromAaron Patterson2013-01-094-1/+18
* Merge pull request #113 from pck/improve-string-encodingAaron Patterson2013-01-062-4/+24
|\
| * Changed Psych::Visitors::YAMLTree.binary?(string).Paul Kunysch2013-01-061-2/+3
| * Testing 8bit ascii_only strings.Paul Kunysch2013-01-061-2/+9
| * Testing custom character-based class.Paul Kunysch2013-01-061-0/+12
|/
* * lib/psych.rb (Psych.load): Return value of Psych::SyntaxError.messageZachary Scott2013-01-031-3/+3
* Merge branch 'master' into nirvdrum-speed_up_node_mappingAaron Patterson2012-12-1745-73/+13077
|\
| * merge changes from ruby trunkAaron Patterson2012-12-1310-36/+33
| * Merge branch 'embed'Aaron Patterson2012-12-1326-25/+12811
| |\
| | * fixing rsyncAaron Patterson2012-11-271-1/+1
| | * make some header file adjustments for ruby compileAaron Patterson2012-11-273-1/+15
| | * updating the version to 2.0Aaron Patterson2012-11-272-9/+24
| | * add the license for libyamlAaron Patterson2012-11-271-0/+19