ruby.git/ext/json/lib, branch v2_0_0_451

merge revision(s) 41862:

2013-07-13T14:36:33+00:00

	fixup stying of `Json#generate` parameter docs by @daveworth [fixes GH-339]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41949 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

merge revision(s) 39208:

2013-02-13T06:34:48+00:00

	* ext/json: merge JSON 1.7.7.
	  This includes security fix. [CVE-2013-0269]
	  https://github.com/flori/json/commit/d0a62f3ced7560daba2ad546d83f0479a5ae2cf2
	  https://groups.google.com/d/topic/rubyonrails-security/4_YvCpLzL58/discussion


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39215 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

* ext/json/lib/json.rb: Move module overview definition for rdoc

2013-02-04T19:39:15+00:00

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39046 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

* ext/json: merge JSON 1.7.5.

2012-12-12T10:51:49+00:00

  fix tests and other fixes.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38346 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

* ext/json/lib/json/generic_object.rb: missing file.

2012-05-07T18:44:36+00:00

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35573 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

* ext/json: Merge JSON 1.7.1.

2012-05-07T16:00:49+00:00

  https://github.com/flori/json/commit/e5b9a9465c1159fae533bca320d950b772bcb4ac

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35568 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

Add missing files of r34971,

2012-03-11T17:42:18+00:00

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34973 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

* ext/json: Merge 164a75c8bd2007d32c4d7665d53140d8fc126dcd.

2012-03-11T13:36:06+00:00

  [ruby-core:41917] [Bug #5846]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34971 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

* ext/json: Merge json gem v1.5.4 (3dab4c5a6a97fac03dac).

2011-08-31T06:56:16+00:00

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33142 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

Don't include complex and rational; fix r33122.

2011-08-30T05:21:27+00:00

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33124 b2dd03c8-39d4-4d8f-98ff-823fe69b080e