Skip to content

Commit 7327977

Browse files
authored
Merge branch 'master' into integrate-postcss
2 parents 46edcbc + f66a9d3 commit 7327977

26 files changed

Lines changed: 45 additions & 39 deletions

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
with:
2626
fetch-depth: 1
2727
- name: Setup Ruby
28-
uses: ruby/setup-ruby@8d27f39a5e7ad39aebbcbd1324f7af020229645c # v1.287.0
28+
uses: ruby/setup-ruby@09a7688d3b55cf0e976497ff046b70949eeaccfd # v1.288.0
2929
with:
3030
ruby-version: ${{ matrix.ruby }}
3131
bundler-cache: true

.github/workflows/draft-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
repository: ruby/ruby
2424
path: ruby
2525

26-
- uses: ruby/setup-ruby@8d27f39a5e7ad39aebbcbd1324f7af020229645c # v1.287.0
26+
- uses: ruby/setup-ruby@09a7688d3b55cf0e976497ff046b70949eeaccfd # v1.288.0
2727
with:
2828
ruby-version: 3.3.4
2929

.github/workflows/jekyll.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- name: Checkout
2424
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2525
- name: Setup Ruby
26-
uses: ruby/setup-ruby@8d27f39a5e7ad39aebbcbd1324f7af020229645c # v1.287.0
26+
uses: ruby/setup-ruby@09a7688d3b55cf0e976497ff046b70949eeaccfd # v1.288.0
2727
with:
2828
ruby-version: '3.2'
2929
bundler-cache: true

Gemfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ gem "validate-website", "~> 1.6"
1515
gem "csv"
1616
gem "base64"
1717

18+
# Jekyll need this for Ruby 4.0.0+
19+
gem "logger"
20+
1821
group :jekyll_plugins do
1922
gem "jekyll-postcss-v2"
2023
end

Gemfile.lock

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ GEM
1212
metrics (~> 0.12)
1313
traces (~> 0.15)
1414
base64 (0.2.0)
15+
benchmark (0.5.0)
1516
bigdecimal (3.1.9)
1617
colorator (1.1.0)
1718
concurrent-ruby (1.3.5)
@@ -62,9 +63,10 @@ GEM
6263
bigdecimal
6364
rake (>= 13)
6465
hashery (2.1.2)
65-
html-proofer (5.0.10)
66+
html-proofer (5.2.0)
6667
addressable (~> 2.3)
6768
async (~> 2.1)
69+
benchmark (~> 0.5)
6870
nokogiri (~> 1.13)
6971
pdf-reader (~> 2.11)
7072
rainbow (~> 3.0)
@@ -108,10 +110,12 @@ GEM
108110
listen (3.9.0)
109111
rb-fsevent (~> 0.10, >= 0.10.3)
110112
rb-inotify (~> 0.9, >= 0.9.10)
113+
logger (1.7.0)
111114
mercenary (0.4.0)
112115
metrics (0.12.2)
113116
mini_portile2 (2.8.9)
114-
minitest (5.25.5)
117+
minitest (6.0.1)
118+
prism (~> 1.5)
115119
nokogiri (1.18.9)
116120
mini_portile2 (~> 2.8.2)
117121
racc (~> 1.4)
@@ -140,6 +144,7 @@ GEM
140144
hashery (~> 2.0)
141145
ruby-rc4
142146
ttfunk
147+
prism (1.9.0)
143148
public_suffix (6.0.1)
144149
racc (1.8.1)
145150
rainbow (3.1.1)
@@ -228,7 +233,6 @@ PLATFORMS
228233
riscv64-linux-android
229234
riscv64-linux-gnu
230235
riscv64-linux-musl
231-
ruby
232236
x86-cygwin
233237
x86-linux
234238
x86-linux-android
@@ -247,6 +251,7 @@ DEPENDENCIES
247251
html-proofer
248252
jekyll
249253
jekyll-postcss-v2
254+
logger
250255
minitest
251256
rake
252257
rouge
@@ -258,6 +263,7 @@ CHECKSUMS
258263
afm (0.2.2) sha256=c83e698e759ab0063331ff84ca39c4673b03318f4ddcbe8e90177dd01e4c721a
259264
async (2.23.1) sha256=612c97346948a5dbfb6b4aef12976416b01aef48ec2d41677efb25c8c32a5006
260265
base64 (0.2.0) sha256=0f25e9b21a02a0cc0cea8ef92b2041035d39350946e8789c562b2d1a3da01507
266+
benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c
261267
bigdecimal (3.1.9) sha256=2ffc742031521ad69c2dfc815a98e426a230a3d22aeac1995826a75dabfad8cc
262268
colorator (1.1.0) sha256=e2f85daf57af47d740db2a32191d1bdfb0f6503a0dfbc8327d0c9154d5ddfc38
263269
concurrent-ruby (1.3.5) sha256=813b3e37aca6df2a21a3b9f1d497f8cbab24a2b94cab325bffe65ee0f6cbebc6
@@ -289,7 +295,7 @@ CHECKSUMS
289295
google-protobuf (4.30.2-x86_64-darwin) sha256=17f4567dff431f8dd5be5ff6395824ec044413f67d2803a9941ebc8c70dec604
290296
google-protobuf (4.30.2-x86_64-linux) sha256=c96993d98732ea185d98279f6c76e130eb9595437dda39610b3398c9e348518e
291297
hashery (2.1.2) sha256=d239cc2310401903f6b79d458c2bbef5bf74c46f3f974ae9c1061fb74a404862
292-
html-proofer (5.0.10) sha256=f1b9b3f5322d5b79a3f4c24b9f08bc425f06b8211bc6d41d8b55f2ee3aebee32
298+
html-proofer (5.2.0) sha256=9d137cc437628b4dfc1191a9f80c5329dfb0a66b895aef021bf10758d80ec69d
293299
http_parser.rb (0.8.0) sha256=5a0932f1fa82ce08a8516a2685d5a86031c000560f89946913c555a0697544be
294300
i18n (1.14.7) sha256=ceba573f8138ff2c0915427f1fc5bdf4aa3ab8ae88c8ce255eb3ecf0a11a5d0f
295301
io-event (1.10.0) sha256=e4e1f5bf01a1a8b8484db3c5d99b431eb3609dbc988b96622d14d77993e0e9dc
@@ -302,10 +308,11 @@ CHECKSUMS
302308
kramdown-parser-gfm (1.1.0) sha256=fb39745516427d2988543bf01fc4cf0ab1149476382393e0e9c48592f6581729
303309
liquid (4.0.4) sha256=4fcfebb1a045e47918388dbb7a0925e7c3893e58d2bd6c3b3c73ec17a2d8fdb3
304310
listen (3.9.0) sha256=db9e4424e0e5834480385197c139cb6b0ae0ef28cc13310cfd1ca78377d59c67
311+
logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203
305312
mercenary (0.4.0) sha256=b25a1e4a59adca88665e08e24acf0af30da5b5d859f7d8f38fba52c28f405138
306313
metrics (0.12.2) sha256=75caab08235dc2b3bb7440e00f64e8426b23b9caa94755d81cf9371fffa1e12a
307314
mini_portile2 (2.8.9) sha256=0cd7c7f824e010c072e33f68bc02d85a00aeb6fce05bb4819c03dfd3c140c289
308-
minitest (5.25.5) sha256=391b6c6cb43a4802bfb7c93af1ebe2ac66a210293f4a3fb7db36f2fc7dc2c756
315+
minitest (6.0.1) sha256=7854c74f48e2e975969062833adc4013f249a4b212f5e7b9d5c040bf838d54bb
309316
nokogiri (1.18.9) sha256=ac5a7d93fd0e3cef388800b037407890882413feccca79eb0272a2715a82fa33
310317
nokogiri (1.18.9-aarch64-linux-gnu) sha256=5bcfdf7aa8d1056a7ad5e52e1adffc64ef53d12d0724fbc6f458a3af1a4b9e32
311318
nokogiri (1.18.9-aarch64-linux-musl) sha256=55e9e6ca46c4ad1715e313f407d8481d15be1e3b65d9f8e52ba1c124d01676a7
@@ -318,6 +325,7 @@ CHECKSUMS
318325
paint (2.3.0) sha256=327d623e4038619d5bd99ae5db07973859cd78400c7f0329eea283cef8e83be5
319326
pathutil (0.16.2) sha256=e43b74365631cab4f6d5e4228f812927efc9cb2c71e62976edcb252ee948d589
320327
pdf-reader (2.14.1) sha256=b45a4521c249a394ad7ad9e691bfd46d4d00998cfc4f019e4525afb4963b411b
328+
prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85
321329
public_suffix (6.0.1) sha256=61d44e1cab5cbbbe5b31068481cf16976dd0dc1b6b07bd95617ef8c5e3e00c6f
322330
racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f
323331
rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a

_data/locales/home/en.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ why_ruby:
6666
Ruby turns ideas into code fast.
6767
Its simplicity keeps me focused; its expressiveness lets me write the way I think.<br />
6868
It feels like the language gets out of the way, leaving just me and the problem.
69-
With great tools and libraries, ideas quickly become running, elegant, code.
69+
With great tools and libraries, ideas quickly become running, elegant code.
7070
7171
- id: community
7272
title: Community

_data/locales/ru.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,5 +204,5 @@ footer:
204204
text: Новости RSS
205205
url: /ru/feeds/news.rss
206206
ruby_license:
207-
text: Ruby License
207+
text: Лицензия Ruby
208208
url: /en/about/license.txt

en/documentation/faq/1/index.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -270,9 +270,6 @@ Originally, or historically, it was called “ruby”.
270270
[http://www.xs4all.nl/~hipster/lib/ruby/ruby.vim](http://www.xs4all.nl/~hipster/lib/ruby/ruby.vim).
271271
* [Jedit](http://jedit.sourceforge.net/): A portable editor written in Java,
272272
comes with support for Ruby.
273-
* [Nedit](http://www.nedit.org): Eric Santonacci has written Ruby support for
274-
Nedit, available from
275-
[ftp://ftp.talc.fr/pub/ruby/ruby.nedit-0.1.tar.gz](ftp://ftp.talc.fr/pub/ruby/ruby.nedit-0.1.tar.gz).
276273
* Barry Shultz has written a Ruby definition file for TextPad, available at
277274
[https://www.textpad.com/add-ons/synn2t.html](https://www.textpad.com/add-ons/synn2t.html).
278275

en/documentation/installation/index.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,6 @@ To get Ruby, just do this:
149149
$ sudo pacman -S ruby
150150
{% endhighlight %}
151151

152-
This should install the latest stable Ruby version.
153-
154152

155153
### Homebrew (macOS)
156154
{: #homebrew}

en/news/_posts/2025-12-18-ruby-4-0-0-preview3-released.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Ruby 4.0 introduces Ruby::Box and "ZJIT", and adds many improvements.
1414
## Ruby::Box
1515

1616
A new (experimental) feature to provide separation about definitions.
17-
For the detail of "Ruby Box", see [doc/language/box.md](https://github.com/ruby/ruby/blob/master/doc/language/box.md).
17+
For the detail of "Ruby Box", see [doc/language/box.md](https://docs.ruby-lang.org/en/4.0/language/box_md.html).
1818
[[Feature #21311]] [[Misc #21385]]
1919

2020
## Language changes
@@ -175,7 +175,7 @@ Note: We're only listing outstanding class updates.
175175
* Ruby::Box
176176
177177
* A new (experimental) feature to provide separation about definitions.
178-
For the detail of "Ruby Box", see [doc/language/box.md](https://github.com/ruby/ruby/blob/master/doc/language/box.md).
178+
For the detail of "Ruby Box", see [doc/language/box.md](https://docs.ruby-lang.org/en/4.0/language/box_md.html).
179179
[[Feature #21311]] [[Misc #21385]]
180180
181181
* Set

0 commit comments

Comments
 (0)