summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* fix exception heirarchysafeloadAaron Patterson2013-02-051-1/+1
* specific symbols can be whitelistedAaron Patterson2013-02-015-17/+41
* adding safe_load for whitelistingAaron Patterson2013-02-0117-55/+330
* * 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
| | * Merge branch 'master' into embedAaron Patterson2012-11-272-1/+2
| | |\
| | * \ Merge branch 'master' into embedembedAaron Patterson2012-11-177-23/+68
| | |\ \
| | * | | fix c file nameAaron Patterson2012-11-171-0/+0
| | * | | only do have_header checks if we are embedding libyamlAaron Patterson2012-11-171-14/+16
| | * | | mkmf has a global for this testAaron Patterson2012-11-171-2/+1
| | * | | fix build on windowsAaron Patterson2012-11-171-5/+5
| | * | | only embed libyaml if the system does not have itAaron Patterson2012-11-1712-1/+17
| | * | | Merge pull request #101 from tarui/embedAaron Patterson2012-11-161-0/+5
| | |\ \ \
| | | * | | for compiling on mswinMasaya TARUI2012-11-171-0/+5
| | |/ / /
| | * | | embedding libyamlAaron Patterson2012-11-1622-878/+13594
| * | | | Merge pull request #106 from atambo/masterAaron Patterson2012-12-082-0/+9
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Strings that start with non-word characters should double quote without excla...Alex Tambellini2012-12-082-0/+9
| |/ / /
| * | | Merge pull request #95 from stomar/doc_deprecatedZachary Scott2012-11-241-0/+1
| |\ \ \
| | * | | * lib/psych/deprecated.rb (load_documents): document deprecationMarcus Stollsteimer2012-10-201-0/+1
| * | | | Merge pull request #104 from olivernn/patch-1Zachary Scott2012-11-201-1/+1
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Update README.rdocOliver Nightingale2012-11-201-1/+1
| |/ / /
| * | | Merge pull request #97 from atambo/masterAaron Patterson2012-11-162-2/+10
| |\ \ \
| | * | | Use literal style when emitting multiline strings, fixes #64Alex Tambellini2012-10-282-2/+10
| * | | | * ext/psych/lib/psych/scalar_scanner.rb: avoid raising exceptions whenAaron Patterson2012-11-163-13/+43
| * | | | * ext/psych/lib/psych/core_ext.rb: move Kernel#y so that it canAaron Patterson2012-11-163-8/+15
| | |_|/ | |/| |
| * | | * ruby.c (load_file_internal): set default source encoding asAaron Patterson2012-11-163-1/+10
| * | | Merge pull request #96 from zzak/masterAaron Patterson2012-11-051-2/+22
| |\ \ \
| | * | | Install documentation, fixes #91Zachary Scott2012-10-201-2/+22
| * | | | * ext/psych/lib/psych/handlers/recorder.rb: added a class forAaron Patterson2012-10-284-0/+87
| * | | | * ext/psych/lib/psych/visitors/yaml_tree.rb: `tree` should return theAaron Patterson2012-10-273-0/+15
| * | | | * ext/psych/lib/psych/visitors/yaml_tree.rb: YAML Tree object shouldAaron Patterson2012-10-273-1/+19
| | |/ / | |/| |
| * | | merging from ruby trunkAaron Patterson2012-10-221-16/+0
| * | | Ignore vim swap files and *.bundleEric Hodel2012-10-221-3/+4
| * | | Psych::SyntaxError now inherits from RuntimeErrorEric Hodel2012-10-223-2/+26
| * | | Skip set_syck on Ruby 2.0 where syck has been removedEric Hodel2012-10-221-0/+6
| | |/ | |/|
| * | Merge pull request #92 from nirvdrum/cache_symbolsAaron Patterson2012-10-131-2/+4
| |\ \ | | |/ | |/|