ruby.git/test/json/test_json_addition.rb, branch v2_0_0_451 The Ruby Programming Language merge revision(s) 39208: 2013-02-13T06:34:48+00:00 naruse naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e 2013-02-13T06:34:48+00:00 b7b9aa6609b0f49c1f7d2935e5a1e3a13223957e * 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: 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: merge JSON 1.7.5. 2012-12-12T10:51:49+00:00 naruse naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e 2012-12-12T10:51:49+00:00 43f6fdfb42d3f4c9025c290bdf5aeffe5959f1bf fix tests and other fixes. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38346 b2dd03c8-39d4-4d8f-98ff-823fe69b080e 
  fix tests and other fixes.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38346 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* ext/json: Merge JSON 1.7.1. 2012-05-07T16:00:49+00:00 naruse naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e 2012-05-07T16:00:49+00:00 5a00be2bf75939fd3bb05dabbdf46244eaa6bb43 https://github.com/flori/json/commit/e5b9a9465c1159fae533bca320d950b772bcb4ac git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35568 b2dd03c8-39d4-4d8f-98ff-823fe69b080e 
  https://github.com/flori/json/commit/e5b9a9465c1159fae533bca320d950b772bcb4ac

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35568 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* ext/json: Merge 164a75c8bd2007d32c4d7665d53140d8fc126dcd. 2012-03-11T13:36:06+00:00 naruse naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e 2012-03-11T13:36:06+00:00 4d8d3184d18b1a9d2eadb86a6688dc62eca7eabc [ruby-core:41917] [Bug #5846] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34971 b2dd03c8-39d4-4d8f-98ff-823fe69b080e 
  [ruby-core:41917] [Bug #5846]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34971 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Remove tests of json/add/{complex, rational}. 2011-09-01T00:23:20+00:00 naruse naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e 2011-09-01T00:23:20+00:00 91e4b4f6d8ca1813df814d74e2675df196a64ff0 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33148 b2dd03c8-39d4-4d8f-98ff-823fe69b080e 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33148 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* ext/json: Merge json gem v1.5.4 (3dab4c5a6a97fac03dac). 2011-08-31T06:56:16+00:00 naruse naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e 2011-08-31T06:56:16+00:00 c06658feba7ae82e175bac72f241029276e715a0 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33142 b2dd03c8-39d4-4d8f-98ff-823fe69b080e 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33142 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* ext/json: Merge json gem 1.5.4+ (2149f4185c598fb97db1). 2011-08-30T02:23:12+00:00 naruse naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e 2011-08-30T02:23:12+00:00 b14c060ddabfad99deff3e56d847034f7d0946be [Bug #5173] [ruby-core:38866] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33122 b2dd03c8-39d4-4d8f-98ff-823fe69b080e 
  [Bug #5173] [ruby-core:38866]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33122 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* ext/json: Merge json gem 1.5.4+ (f7f78896607b6f6226cd). 2011-07-10T08:01:04+00:00 naruse naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e 2011-07-10T08:01:04+00:00 a2e497d5ede45bd4f4a57f494027020d7bd1733b [Bug #4700] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32493 b2dd03c8-39d4-4d8f-98ff-823fe69b080e 
  [Bug #4700]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32493 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* remove trailing spaces. 2011-05-15T11:55:52+00:00 nobu nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e 2011-05-15T11:55:52+00:00 3a47cf3395dd4c4fe8bdd5df13aab698f2ca314b git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31573 b2dd03c8-39d4-4d8f-98ff-823fe69b080e 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31573 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* ext/json: Update github/flori/json from 1.4.2+ to 2010-12-01T16:26:13+00:00 naruse naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e 2010-12-01T16:26:13+00:00 4a84c27e3ee50c4989591fcde2b7a10c5ccc0395 e22b2f2bdfe6a9b0. this fixes some bugs. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30003 b2dd03c8-39d4-4d8f-98ff-823fe69b080e 
  e22b2f2bdfe6a9b0. this fixes some bugs.

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