summaryrefslogtreecommitdiff
path: root/ext
AgeCommit message (Collapse)Author
2016-11-16Picked regression fix from a7be452b88b274e456f3de5fde93bf41a94e48bcSHIBATA Hiroshi
2016-11-16Removed trailing white-spaces.SHIBATA Hiroshi
2016-11-16Fixed regression of typofix. Picked following commits.SHIBATA Hiroshi
* 41049830e1252f17bdaa076d816352658025af9c * 0ed8647f7fe56736bbbd290a0b38f9e21b350769 * 8409644bf70e1be05b16b7984b7b61de321bab90
2016-11-14Revert changesets after the libyaml-0.1.7 releaseSHIBATA Hiroshi
2016-11-13Update new canonical urlsSHIBATA Hiroshi
2016-11-13Merge libyaml-0.1.7 from upstreamSHIBATA Hiroshi
2016-09-30Stop using deprecated JRuby APIs. Fixes #292.Charles Oliver Nutter
2016-06-24Merge pull request #274 from bbashy/patch-1SHIBATA Hiroshi
Typo with "indentation"
2016-06-24Merge pull request #275 from davydovanton/doc-fix-typoSHIBATA Hiroshi
Fix typo in error message
2016-03-20Fix typo in error message [skip ci]Anton Davydov
2016-02-25Typo with "indentation"Ben Sampson
Intendation => Indentation
2016-02-23Temporary disabled to frozen literal string.SHIBATA Hiroshi
ref. https://github.com/ruby/ruby/commit/3e92b635fb5422207b7bbdc924e292e51e21f040
2015-12-22backport revision r53078 and r53079 from ruby/ruby.SHIBATA Hiroshi
https://github.com/ruby/ruby/commit/cc0313436160b735a3d41361cb5e3eeb10fcbdad https://github.com/ruby/ruby/commit/db48c307944a9a18877236bdf9e9b778875f38ed
2015-11-08backword compatibility of Ruby 2.0.0SHIBATA Hiroshi
2015-11-06merge r52447, r52448 and r52453 from ruby/ruby trunkSHIBATA Hiroshi
2015-09-09Fix spelling typo: uknown -> unknownCharlie Sanders
2015-08-27Fix Encoding::UndefinedConversionError when dumping non ascii string to a file.Yuji Yamano
2015-08-21If incoming string is not unicode, transcode to UTF-8.Charles Oliver Nutter
2015-08-21Merge branch 'master' into jrubyAaron Patterson
* master: psych: allocate structs with wrapper update minitest gem to 5.x, add Ruby 2.2 test target
2015-05-29psych: allocate structs with wrappernobu
* ext/psych/psych_emitter.c (allocate): allocate structs with making new wrapper objects and get rid of potential memory leak. * ext/psych/psych_parser.c (allocate): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50672 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-05-05Default to UTF-8 when encoding does not appear to be unicode.Charles Oliver Nutter
Fixes jruby/jruby#2901.
2015-03-03Merge branch 'master' into jrubyAaron Patterson
* master: Adding Rubinius as an Allowed Failure bump version Fix CVE-2014-9130 Adding RVM listing for Rubinius fix minitest warnings * ext/psych/lib/psych/visitors/yaml_tree.rb: register nodes when dumping objects with custom coders. [ruby-core:66215] [Bug #10496] * ext/psych/lib/psych/visitors/to_ruby.rb: fix support for regular expressions with newlines. tenderlove/psych#222 * ext/psych/lib/psych/visitors/to_ruby.rb: fix parsing hashes with instance variables when it is referenced multiple times. * ext/psych/lib/psych.rb: bump version * ext/psych/psych.gemspec: bump version * test/psych/test_hash.rb: test for fix bump version Fix anchor Fix assertion regexps bump version Only dump ivars for subclasses of String, not for String. With cf0dd2b93f1552a3c452a0bfa0e996f441d5e27e, fixes #217. Only dump ivars for subclasses of Hash, not for Hash. Fixes #216. Fixes part of #217. Fix block chomping and add more tests Preset @line_width in YAMLTree#initialize for better performance Use appropriate style for serialized strings Remove unnnecessary 'str' variable in YAMLTree#visit_String
2015-02-26setup java platform gemChristian Meier
use maven to resolve jar dependencies for compilation. setup jar-dependencies to install the snakeyaml jar when installing the gem via rubygems or bundler. added java code to reflect the snakeyaml vesion which got finally loaded into the jruby-classloader.
2015-02-17Fix CVE-2014-9130Florian Frank
See https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2014-9130 This is already fixed in libyaml via this patch: https://bitbucket.org/xi/libyaml/commits/2b9156756423e967cfd09a61d125d883fca6f4f2
2015-01-09Merge remote-tracking branch 'origin/master' into jrubyCharles Oliver Nutter
Conflicts: .gitignore
2015-01-09Update to latest code from JRuby master.Charles Oliver Nutter
2014-12-02fixed build error caused by trunk changesSHIBATA Hiroshi
2014-12-01merging from ruby trunkAaron Patterson
2014-03-27backport from libyaml-1.1.6SHIBATA Hiroshi
2014-02-21backport from ruby trunkSHIBATA Hiroshi
2014-02-05merge from ruby trunkAaron Patterson
2014-02-05* ext/psych/yaml/config.h: bump libyaml to 0.1.5Zachary Scott
2014-02-04* ext/psych/yaml/emitter.c: merge libyaml 0.1.5Aaron Patterson
* ext/psych/yaml/loader.c: ditto * ext/psych/yaml/parser.c: ditto * ext/psych/yaml/reader.c: ditto * ext/psych/yaml/scanner.c: ditto * ext/psych/yaml/writer.c: ditto * ext/psych/yaml/yaml_private.h: ditto
2014-01-19fix typo at https://github.com/ruby/ruby/pull/500 and ↵SHIBATA Hiroshi
https://github.com/ruby/ruby/pull/506
2013-12-11fix typoAkira Matsuda
s/preceeded/preceded/
2013-09-20* ext/psych/yaml/yaml.h: [DOC] fix typo by @GreenGeorge [Fixes GH-161]Zachary Scott
https://github.com/tenderlove/psych/pull/161
2013-07-05merging from ruby trunkAaron Patterson
2013-05-14* ext/psych/lib/psych.rb: Adding Psych.safe_load for loading a userAaron Patterson
defined, restricted subset of Ruby object types. * ext/psych/lib/psych/class_loader.rb: A class loader for encapsulating the logic for which objects are allowed to be deserialized. * ext/psych/lib/psych/deprecated.rb: Changes to use the class loader * ext/psych/lib/psych/exception.rb: ditto * ext/psych/lib/psych/json/stream.rb: ditto * ext/psych/lib/psych/nodes/node.rb: ditto * ext/psych/lib/psych/scalar_scanner.rb: ditto * ext/psych/lib/psych/stream.rb: ditto * ext/psych/lib/psych/streaming.rb: ditto * ext/psych/lib/psych/visitors/json_tree.rb: ditto * ext/psych/lib/psych/visitors/to_ruby.rb: ditto * ext/psych/lib/psych/visitors/yaml_tree.rb: ditto * ext/psych/psych_to_ruby.c: ditto * test/psych/helper.rb: ditto * test/psych/test_safe_load.rb: tests for restricted subset. * test/psych/test_scalar_scanner.rb: ditto * test/psych/visitors/test_to_ruby.rb: ditto * test/psych/visitors/test_yaml_tree.rb: ditto
2013-05-14merge from RubyAaron Patterson
2013-01-13* ext/psych/yaml/scanner.c: Typos by James Dabbs [Github Fixes #118]Zachary Scott
2012-12-13merge changes from ruby trunkAaron Patterson
2012-11-27make some header file adjustments for ruby compileAaron Patterson
2012-11-27add the license for libyamlAaron Patterson
2012-11-17fix c file nameAaron Patterson
2012-11-17only do have_header checks if we are embedding libyamlAaron Patterson
2012-11-17mkmf has a global for this testAaron Patterson
2012-11-17fix build on windowsAaron Patterson
2012-11-17only embed libyaml if the system does not have itAaron Patterson
2012-11-17for compiling on mswinMasaya TARUI
I checked only mswin environment. Maybe it is required for mingw?
2012-11-16embedding libyamlAaron Patterson
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-26 15:45:30 +0000