Skip to content

Commit e8d9c83

Browse files
authored
Merge branch 'master' into translate_cve-2024-43398_zh_cn
2 parents 20a0ac2 + 5295136 commit e8d9c83

File tree

54 files changed

+601
-157
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+601
-157
lines changed

.github/workflows/draft-release.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,13 @@ jobs:
1616
runs-on: ubuntu-latest
1717
steps:
1818
- uses: actions/checkout@v4
19+
with:
20+
path: www
21+
22+
- uses: actions/checkout@v4
23+
with:
24+
repository: ruby/ruby
25+
path: ruby
1926

2027
- uses: ruby/setup-ruby@v1
2128
with:
@@ -25,6 +32,11 @@ jobs:
2532
run: |
2633
ruby lib/draft-release.rb ${{ github.event.client_payload.version || github.event.inputs.version }}
2734
35+
- name: Update data files
36+
run: |
37+
tool/format-release ../www ${{ github.event.client_payload.version || github.event.inputs.version }} .
38+
working-directory: ruby
39+
2840
- name: Create Commit
2941
run: |
3042
git config user.name "GitHub Actions Bot"
@@ -43,3 +55,5 @@ jobs:
4355
title: "Create release for ${{ github.event.client_payload.version || github.event.inputs.version }}"
4456
body: "This is an automated pull request to create a release"
4557
draft: true
58+
59+
working-directory: www

Gemfile.lock

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@ GEM
22
remote: https://rubygems.org/
33
specs:
44
Ascii85 (1.1.1)
5-
addressable (2.8.6)
6-
public_suffix (>= 2.0.2, < 6.0)
5+
addressable (2.8.7)
6+
public_suffix (>= 2.0.2, < 7.0)
77
afm (0.2.2)
8-
async (2.12.0)
9-
console (~> 1.25, >= 1.25.2)
8+
async (2.15.3)
9+
console (~> 1.26)
1010
fiber-annotation
11-
io-event (~> 1.6)
11+
io-event (~> 1.6, >= 1.6.5)
1212
base64 (0.2.0)
1313
bigdecimal (3.1.8)
1414
colorator (1.1.0)
15-
concurrent-ruby (1.3.3)
16-
console (1.25.2)
15+
concurrent-ruby (1.3.4)
16+
console (1.27.0)
1717
fiber-annotation
1818
fiber-local (~> 1.1)
1919
json
@@ -38,24 +38,24 @@ GEM
3838
fiber-annotation (0.2.0)
3939
fiber-local (1.1.0)
4040
fiber-storage
41-
fiber-storage (0.1.2)
41+
fiber-storage (1.0.0)
4242
forwardable-extended (2.6.0)
43-
google-protobuf (4.27.1)
43+
google-protobuf (4.27.3)
4444
bigdecimal
4545
rake (>= 13)
46-
google-protobuf (4.27.1-aarch64-linux)
46+
google-protobuf (4.27.3-aarch64-linux)
4747
bigdecimal
4848
rake (>= 13)
49-
google-protobuf (4.27.1-arm64-darwin)
49+
google-protobuf (4.27.3-arm64-darwin)
5050
bigdecimal
5151
rake (>= 13)
52-
google-protobuf (4.27.1-x86-linux)
52+
google-protobuf (4.27.3-x86-linux)
5353
bigdecimal
5454
rake (>= 13)
55-
google-protobuf (4.27.1-x86_64-darwin)
55+
google-protobuf (4.27.3-x86_64-darwin)
5656
bigdecimal
5757
rake (>= 13)
58-
google-protobuf (4.27.1-x86_64-linux)
58+
google-protobuf (4.27.3-x86_64-linux)
5959
bigdecimal
6060
rake (>= 13)
6161
hashery (2.1.2)
@@ -71,7 +71,7 @@ GEM
7171
http_parser.rb (0.8.0)
7272
i18n (1.14.5)
7373
concurrent-ruby (~> 1.0)
74-
io-event (1.6.4)
74+
io-event (1.6.5)
7575
jekyll (4.3.3)
7676
addressable (~> 2.4)
7777
colorator (~> 1.0)
@@ -102,18 +102,18 @@ GEM
102102
rb-fsevent (~> 0.10, >= 0.10.3)
103103
rb-inotify (~> 0.9, >= 0.9.10)
104104
mercenary (0.4.0)
105-
minitest (5.23.1)
106-
nokogiri (1.16.6-aarch64-linux)
105+
minitest (5.25.1)
106+
nokogiri (1.16.7-aarch64-linux)
107107
racc (~> 1.4)
108-
nokogiri (1.16.6-arm-linux)
108+
nokogiri (1.16.7-arm-linux)
109109
racc (~> 1.4)
110-
nokogiri (1.16.6-arm64-darwin)
110+
nokogiri (1.16.7-arm64-darwin)
111111
racc (~> 1.4)
112-
nokogiri (1.16.6-x86-linux)
112+
nokogiri (1.16.7-x86-linux)
113113
racc (~> 1.4)
114-
nokogiri (1.16.6-x86_64-darwin)
114+
nokogiri (1.16.7-x86_64-darwin)
115115
racc (~> 1.4)
116-
nokogiri (1.16.6-x86_64-linux)
116+
nokogiri (1.16.7-x86_64-linux)
117117
racc (~> 1.4)
118118
paint (2.3.0)
119119
pathutil (0.16.2)
@@ -124,8 +124,8 @@ GEM
124124
hashery (~> 2.0)
125125
ruby-rc4
126126
ttfunk
127-
public_suffix (5.1.0)
128-
racc (1.8.0)
127+
public_suffix (6.0.1)
128+
racc (1.8.1)
129129
rainbow (3.1.1)
130130
rake (13.2.1)
131131
rb-fsevent (0.11.2)
@@ -136,26 +136,26 @@ GEM
136136
rouge (4.3.0)
137137
ruby-rc4 (0.1.5)
138138
safe_yaml (1.0.5)
139-
sass-embedded (1.77.5-aarch64-linux-gnu)
140-
google-protobuf (>= 3.25, < 5.0)
141-
sass-embedded (1.77.5-aarch64-linux-musl)
142-
google-protobuf (>= 3.25, < 5.0)
143-
sass-embedded (1.77.5-arm-linux-gnueabihf)
144-
google-protobuf (>= 3.25, < 5.0)
145-
sass-embedded (1.77.5-arm-linux-musleabihf)
146-
google-protobuf (>= 3.25, < 5.0)
147-
sass-embedded (1.77.5-arm64-darwin)
148-
google-protobuf (>= 3.25, < 5.0)
149-
sass-embedded (1.77.5-x86-linux-gnu)
150-
google-protobuf (>= 3.25, < 5.0)
151-
sass-embedded (1.77.5-x86-linux-musl)
152-
google-protobuf (>= 3.25, < 5.0)
153-
sass-embedded (1.77.5-x86_64-darwin)
154-
google-protobuf (>= 3.25, < 5.0)
155-
sass-embedded (1.77.5-x86_64-linux-gnu)
156-
google-protobuf (>= 3.25, < 5.0)
157-
sass-embedded (1.77.5-x86_64-linux-musl)
158-
google-protobuf (>= 3.25, < 5.0)
139+
sass-embedded (1.77.8-aarch64-linux-gnu)
140+
google-protobuf (~> 4.26)
141+
sass-embedded (1.77.8-aarch64-linux-musl)
142+
google-protobuf (~> 4.26)
143+
sass-embedded (1.77.8-arm-linux-gnueabihf)
144+
google-protobuf (~> 4.26)
145+
sass-embedded (1.77.8-arm-linux-musleabihf)
146+
google-protobuf (~> 4.26)
147+
sass-embedded (1.77.8-arm64-darwin)
148+
google-protobuf (~> 4.26)
149+
sass-embedded (1.77.8-x86-linux-gnu)
150+
google-protobuf (~> 4.26)
151+
sass-embedded (1.77.8-x86-linux-musl)
152+
google-protobuf (~> 4.26)
153+
sass-embedded (1.77.8-x86_64-darwin)
154+
google-protobuf (~> 4.26)
155+
sass-embedded (1.77.8-x86_64-linux-gnu)
156+
google-protobuf (~> 4.26)
157+
sass-embedded (1.77.8-x86_64-linux-musl)
158+
google-protobuf (~> 4.26)
159159
slop (4.10.1)
160160
spidr (0.7.1)
161161
nokogiri (~> 1.3)
@@ -184,7 +184,7 @@ GEM
184184
rexml (~> 3.2)
185185
webrick (1.8.1)
186186
yell (2.2.2)
187-
zeitwerk (2.6.16)
187+
zeitwerk (2.6.17)
188188

189189
PLATFORMS
190190
aarch64-linux
@@ -215,4 +215,4 @@ DEPENDENCIES
215215
validate-website (~> 1.6)
216216

217217
BUNDLED WITH
218-
2.5.13
218+
2.5.17

_data/downloads.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ preview:
88

99
stable:
1010

11-
- 3.3.4
11+
- 3.3.5
1212
- 3.2.5
1313

1414
# optional

_data/locales/ja.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ ruby: Ruby
33
slogan: A Programmer's Best Friend
44

55
sitelinks:
6-
- text: Home
6+
- text: ホーム
77
url: /ja
88
home: true
99
- text: ダウンロード

_data/releases.yml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,30 @@
5252

5353
# 3.3 series
5454

55+
- version: 3.3.5
56+
date: 2024-09-03
57+
post: /en/news/2024/09/03/3-3-5-released/
58+
url:
59+
gz: https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.5.tar.gz
60+
zip: https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.5.zip
61+
xz: https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.5.tar.xz
62+
size:
63+
gz: 22129139
64+
zip: 27020194
65+
xz: 16403660
66+
sha1:
67+
gz: 59444476bbe9e789fc777d8fb4dd456bc057604f
68+
zip: ccb32746aef491ce05be42218301e2c47185e5fc
69+
xz: 692bc3188bdb9ec30b8672543961b011d699590a
70+
sha256:
71+
gz: 3781a3504222c2f26cb4b9eb9c1a12dbf4944d366ce24a9ff8cf99ecbce75196
72+
zip: d3c13e124707494935d00ebc5c7983b0252bc13de49223fd31104ba5467a057a
73+
xz: 51aec7ea89b46125a2c9adc6f36766b65023d47952b916b1aed300ddcc042359
74+
sha512:
75+
gz: 5c482059628ef9de5d8a6ad4751f8043f2fc2b159b768265be7f3ee0574ad51d9500ee4fc9146c5978fbd51313039c3de39e7b7a4dedc9bcd5d09a41a713f1a7
76+
zip: bf83af835a74283aff21042538ee1f1eb70ff12dac1edd4672d787547cd29cb7b69a9299682f89c8499eb610737b10a7fc03eca038574cb4ba565205d96b0016
77+
xz: dd5c6a7f74854e143e0ca46b9d7c0d1983fc4886f5f733cd108345dbf4b21f61ad978ad6806e05a57b7af28fd9216dd38d7145808188bbb3695a7f3a4eda3883
78+
5579
- version: 3.3.4
5680
date: 2024-07-09
5781
post: /en/news/2024/07/09/ruby-3-3-4-released/

bg/community/mailing-lists/index.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,6 @@ comp.lang.ruby дискусионна група.
3636

3737

3838

39-
[3]: https://ml.ruby-lang.org/mailman3/hyperkitty/list/[email protected]/
40-
[4]: https://ml.ruby-lang.org/mailman3/hyperkitty/list/[email protected]/
41-
[5]: https://ml.ruby-lang.org/mailman3/hyperkitty/list/[email protected]/
39+
[3]: https://ml.ruby-lang.org/archives/list/[email protected]/
40+
[4]: https://ml.ruby-lang.org/archives/list/[email protected]/
41+
[5]: https://ml.ruby-lang.org/archives/list/[email protected]/

de/community/mailing-lists/index.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ einschließlich der Listen in japanischer Sprache.
5050

5151
[guidelines]: /en/community/mailing-lists/ruby-talk-guidelines/
5252
[clrFAQ]: http://rubyhacker.com/clrFAQ.html
53-
[3]: https://ml.ruby-lang.org/mailman3/hyperkitty/list/[email protected]/
54-
[4]: https://ml.ruby-lang.org/mailman3/hyperkitty/list/[email protected]/
55-
[5]: https://ml.ruby-lang.org/mailman3/hyperkitty/list/[email protected]/
53+
[3]: https://ml.ruby-lang.org/archives/list/[email protected]/
54+
[4]: https://ml.ruby-lang.org/archives/list/[email protected]/
55+
[5]: https://ml.ruby-lang.org/archives/list/[email protected]/
5656
[6]: http://lists.ruby-lang.org/cgi-bin/mailman/listinfo/ruby-de
5757
[7]: http://lists.ruby-lang.org/pipermail/ruby-de/
5858
[8]: http://planet.ruby-portal.de/ruby-de.html

en/community/mailing-lists/index.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ including the lists in Japanese language.
3939

4040
[guidelines]: ruby-talk-guidelines/
4141
[clrFAQ]: http://rubyhacker.com/clrFAQ.html
42-
[3]: https://ml.ruby-lang.org/mailman3/hyperkitty/list/[email protected]/
43-
[4]: https://ml.ruby-lang.org/mailman3/hyperkitty/list/[email protected]
44-
[5]: https://ml.ruby-lang.org/mailman3/hyperkitty/list/[email protected]/
42+
[3]: https://ml.ruby-lang.org/archives/list/[email protected]/
43+
[4]: https://ml.ruby-lang.org/archives/list/[email protected]
44+
[5]: https://ml.ruby-lang.org/archives/list/[email protected]/
4545
[rubytalk]: https://rubytalk.org/

en/documentation/faq/1/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ There are several mailing lists talking about Ruby. See the
205205
page for more information.
206206

207207
You can search the mailing list archives using
208-
[https://ml.ruby-lang.org/mailman3/hyperkitty/list/[email protected]/](https://ml.ruby-lang.org/mailman3/hyperkitty/list/[email protected]/).
208+
[https://ml.ruby-lang.org/archives/list/[email protected]/](https://ml.ruby-lang.org/archives/list/[email protected]/).
209209
(This is the URL for the ruby-talk list, munge as required for the others).
210210

211211
### How can I thread the mailing list in mutt?

en/documentation/index.md

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -55,15 +55,6 @@ the [installation guide](installation/) for help on installing Ruby.
5555
: The official Ruby API documentation for different versions including
5656
the currently unreleased (trunk) version.
5757

58-
[Ruby Core Reference][13]
59-
: Pulled straight from the source code using [RDoc][14], this reference
60-
work documents all of the core classes and modules (like String,
61-
Array, Symbol, etc…).
62-
63-
[Ruby Standard Library Reference][15]
64-
: Also pulled from the source code using RDoc, this reference work
65-
documents the standard library.
66-
6758
[Ruby C API Reference][extensions]
6859
: The official introduction to Ruby's C API.
6960
Great if you want to write C extensions
@@ -73,12 +64,6 @@ the [installation guide](installation/) for help on installing Ruby.
7364
: The one-stop web site for reference documentation about Ruby gems and
7465
GitHub-hosted Ruby projects.
7566

76-
[Ruby & Rails Searchable API Docs][17]
77-
: Rails and Ruby documentation with smart searching.
78-
79-
[APIdock][18]
80-
: Ruby, Rails and RSpec documentation with users’ notes.
81-
8267
[RubyAPI.org][rubyapi-org]
8368
: Easily find and browse Ruby classes, modules, and methods.
8469

@@ -125,8 +110,6 @@ documentation sources.
125110
If you have questions about Ruby the
126111
[mailing list](/en/community/mailing-lists/) is a great place to start.
127112

128-
129-
130113
[1]: https://try.ruby-lang.org/
131114
[2]: https://rubykoans.com/
132115
[5]: https://poignant.guide
@@ -135,13 +118,8 @@ If you have questions about Ruby the
135118
[9]: http://www.ruby-doc.org/docs/ProgrammingRuby/
136119
[10]: http://pragmaticprogrammer.com/titles/ruby/index.html
137120
[12]: http://en.wikibooks.org/wiki/Ruby_programming_language
138-
[13]: http://www.ruby-doc.org/core
139-
[14]: https://ruby.github.io/rdoc/
140-
[15]: http://www.ruby-doc.org/stdlib
141121
[extensions]: https://docs.ruby-lang.org/en/master/extension_rdoc.html
142122
[16]: http://www.rubydoc.info/
143-
[17]: http://rubydocs.org/
144-
[18]: http://apidock.com/
145123
[rubyapi-org]: https://rubyapi.org/
146124
[19]: http://www.aptana.com/
147125
[20]: http://www.gnu.org/software/emacs/
@@ -165,7 +143,7 @@ If you have questions about Ruby the
165143
[39]: http://kapeli.com/dash
166144
[docs-rlo-en]: https://docs.ruby-lang.org/en/
167145
[atom]: https://atom.io/
168-
[vscode]: https://code.visualstudio.com/
146+
[vscode]: https://code.visualstudio.com/docs/languages/ruby
169147
[eric]: https://eric-ide.python-projects.org/
170148
[kdevelop]: https://www.kdevelop.org/
171149
[kate]: https://kate-editor.org/

0 commit comments

Comments
 (0)