Skip to content

Commit 8c7e291

Browse files
committed
Update references to flori/json
Now that the repository was transfered, these links will become dead in a few months.
1 parent 05d3b72 commit 8c7e291

File tree

8 files changed

+12
-13
lines changed

8 files changed

+12
-13
lines changed

complex.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2588,7 +2588,7 @@ float_arg(VALUE self)
25882588
* - #as_json: Returns a serialized hash constructed from +self+.
25892589
* - #to_json: Returns a JSON string representing +self+.
25902590
*
2591-
* These methods are provided by the {JSON gem}[https://github.com/flori/json]. To make these methods available:
2591+
* These methods are provided by the {JSON gem}[https://github.com/ruby/json]. To make these methods available:
25922592
*
25932593
* require 'json/add/complex'
25942594
*

doc/ChangeLog/ChangeLog-1.9.3

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9012,7 +9012,7 @@ Thu Dec 2 01:24:39 2010 NARUSE, Yui <naruse@ruby-lang.org>
90129012

90139013
Thu Dec 2 01:02:03 2010 NARUSE, Yui <naruse@ruby-lang.org>
90149014

9015-
* ext/json: Update github/flori/json from 1.4.2+ to
9015+
* ext/json: Update github/ruby/json from 1.4.2+ to
90169016
e22b2f2bdfe6a9b0. this fixes some bugs.
90179017

90189018
Thu Dec 2 00:05:44 2010 NARUSE, Yui <naruse@ruby-lang.org>

doc/ChangeLog/ChangeLog-2.0.0

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14426,7 +14426,7 @@ Tue May 8 02:34:26 2012 NARUSE, Yui <naruse@ruby-lang.org>
1442614426
Mon May 7 21:19:17 2012 NARUSE, Yui <naruse@ruby-lang.org>
1442714427

1442814428
* ext/json: Merge JSON 1.7.1.
14429-
https://github.com/flori/json/commit/e5b9a9465c1159fae533bca320d950b772bcb4ac
14429+
https://github.com/ruby/json/commit/e5b9a9465c1159fae533bca320d950b772bcb4ac
1443014430

1443114431
Mon May 7 22:54:22 2012 Martin Bosslet <Martin.Bosslet@googlemail.com>
1443214432

doc/ChangeLog/ChangeLog-2.1.0

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2167,7 +2167,7 @@ Wed Nov 20 11:46:38 2013 NARUSE, Yui <naruse@ruby-lang.org>
21672167
* ext/json: merge JSON 1.8.1.
21682168
https://github.com/nurse/json/compare/002ac2771ce32776b32ccd2d06e5604de6c36dcd...e09ffc0d7da25d0393873936c118c188c78dbac3
21692169
* Remove Rubinius exception since transcoding should be working now.
2170-
* Fix https://github.com/flori/json/issues/162 reported by Marc-Andre
2170+
* Fix https://github.com/ruby/json/issues/162 reported by Marc-Andre
21712171
Lafortune <github_rocks@marc-andre.ca>. Thanks!
21722172
* Applied patches by Yui NARUSE <naruse@airemix.jp> to suppress
21732173
warning with -Wchar-subscripts and better validate UTF-8 strings.
@@ -17913,7 +17913,7 @@ Tue Feb 12 12:02:35 2013 NARUSE, Yui <naruse@ruby-lang.org>
1791317913

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

1791917919
Mon Feb 11 23:08:48 2013 Tanaka Akira <akr@fsij.org>

doc/ChangeLog/ChangeLog-2.3.0

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1211,7 +1211,7 @@ Sun Dec 6 08:39:05 2015 SHIBATA Hiroshi <hsbt@ruby-lang.org>
12111211
upstream changes.
12121212

12131213
https://github.com/ruby/ruby/commit/4d059bf9f5f10f3d3088de49fc87e5555db7770d
1214-
https://github.com/flori/json/commit/d4c99de78905d96c3f301f48b2c789943bb3f098
1214+
https://github.com/ruby/json/commit/d4c99de78905d96c3f301f48b2c789943bb3f098
12151215

12161216
* ext/json/lib/json/version.rb: ditto.
12171217

@@ -10989,7 +10989,7 @@ Fri Feb 13 21:16:00 2015 Yusuke Endoh <mame@tsg.ne.jp>
1098910989

1099010990
Fri Feb 13 14:19:06 2015 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
1099110991

10992-
* ext/json: merge upstream from flori/json
10992+
* ext/json: merge upstream from ruby/json
1099310993
change usage of TypedData. [Feature #10739][ruby-core:67564]
1099410994

1099510995
Thu Feb 12 18:34:01 2015 multisnow <infinity.blick.winkel@gmail.com>
@@ -11556,7 +11556,7 @@ Tue Jan 13 21:08:22 2015 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
1155611556

1155711557
* ext/json, test/json: merge JSON HEAD(259dee6)
1155811558
separate implementation of Typed_Data macro.
11559-
https://github.com/flori/json/compare/v1.8.1...v1.8.2
11559+
https://github.com/ruby/json/compare/v1.8.1...v1.8.2
1156011560

1156111561
Tue Jan 13 14:16:35 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
1156211562

@@ -12009,7 +12009,7 @@ Mon Dec 29 10:37:27 2014 Thiago Lewin <thiago_lewin@yahoo.com.br>
1200912009
Mon Dec 29 07:27:23 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
1201012010

1201112011
* ext/json, test/json: merge JSON HEAD(17fe8e7)
12012-
https://github.com/flori/json/compare/v1.8.1...17fe8e7
12012+
https://github.com/ruby/json/compare/v1.8.1...17fe8e7
1201312013

1201412014
Sun Dec 28 23:49:37 2014 Michal Papis <mpapis@gmail.com>
1201512015

doc/ChangeLog/ChangeLog-2.4.0

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2668,8 +2668,8 @@ Wed Jul 6 07:11:27 2016 Shugo Maeda <shugo@ruby-lang.org>
26682668
Tue Jul 5 20:49:30 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org>
26692669

26702670
* ext/json/*, test/json/*: Update json-2.0.1.
2671-
Changes of 2.0.0: https://github.com/flori/json/blob/f679ebd0c69a94e3e70a897ac9a229f5779c2ee1/CHANGES.md#2015-09-11-200
2672-
Changes of 2.0.1: https://github.com/flori/json/blob/f679ebd0c69a94e3e70a897ac9a229f5779c2ee1/CHANGES.md#2016-07-01-201
2671+
Changes of 2.0.0: https://github.com/ruby/json/blob/f679ebd0c69a94e3e70a897ac9a229f5779c2ee1/CHANGES.md#2015-09-11-200
2672+
Changes of 2.0.1: https://github.com/ruby/json/blob/f679ebd0c69a94e3e70a897ac9a229f5779c2ee1/CHANGES.md#2016-07-01-201
26732673
[Feature #12542][ruby-dev:49706][fix GH-1395]
26742674

26752675
Tue Jul 5 19:39:49 2016 Naohisa Goto <ngotogenome@gmail.com>

doc/maintainers.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ have commit right, others don't.
348348
#### ext/json
349349
* NARUSE, Yui (naruse)
350350
* Hiroshi SHIBATA (hsbt)
351-
* https://github.com/flori/json
351+
* https://github.com/ruby/json
352352
* https://rubygems.org/gems/json
353353

354354
#### ext/openssl

test/json/json_parser_test.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ def test_argument_encoding
2727
end if defined?(Encoding::UTF_16)
2828

2929
def test_error_message_encoding
30-
# https://github.com/flori/json/actions/runs/6478148162/job/17589572890
3130
pend if RUBY_ENGINE == 'truffleruby'
3231

3332
bug10705 = '[ruby-core:67386] [Bug #10705]'

0 commit comments

Comments
 (0)