Skip to content

Commit 74aa661

Browse files
committed
Merge branch 'main' into add/threejs-docs
2 parents 35b7c73 + 8f29e60 commit 74aa661

Some content is hidden

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

70 files changed

+282
-119
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ jobs:
1313
steps:
1414
- uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0
1515
- name: Set up Ruby
16-
uses: ruby/setup-ruby@540484a3c0f308b08619664ec40bf6c371d172c3 # v1.205.0
16+
uses: ruby/setup-ruby@32110d4e311bd8996b2a82bf2a43b714ccc91777 # v1.221.0
1717
with:
1818
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
1919
- name: Run tests
2020
run: bundle exec rake
2121
- name: Deploy to Heroku
22-
uses: akhileshns/heroku-deploy@581dd286c962b6972d427fcf8980f60755c15520 # v3.13.15
22+
uses: akhileshns/heroku-deploy@e3eb99d45a8e2ec5dca08735e089607befa4bf28 # v3.14.15
2323
with:
2424
heroku_api_key: ${{secrets.HEROKU_API_KEY}}
2525
heroku_app_name: "devdocs"

.github/workflows/schedule-doc-report.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
steps:
1212
- uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0
1313
- name: Set up Ruby
14-
uses: ruby/setup-ruby@540484a3c0f308b08619664ec40bf6c371d172c3 # v1.205.0
14+
uses: ruby/setup-ruby@32110d4e311bd8996b2a82bf2a43b714ccc91777 # v1.221.0
1515
with:
1616
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
1717
- name: Generate report

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
steps:
1212
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1313
- name: Set up Ruby
14-
uses: ruby/setup-ruby@540484a3c0f308b08619664ec40bf6c371d172c3 # v1.205.0
14+
uses: ruby/setup-ruby@32110d4e311bd8996b2a82bf2a43b714ccc91777 # v1.221.0
1515
with:
1616
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
1717
- name: Run tests

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.3.6
1+
3.4.2

.tool-versions

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ruby 3.3.6
1+
ruby 3.4.2

COPYRIGHT

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright 2013-2024 Thibaut Courouble and other contributors
1+
Copyright 2013-2025 Thibaut Courouble and other contributors
22

33
This Source Code Form is subject to the terms of the Mozilla Public
44
License, v. 2.0. If a copy of the MPL was not distributed with this

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ruby:3.3.6
1+
FROM ruby:3.4.2
22
ENV LANG=C.UTF-8
33
ENV ENABLE_SERVICE_WORKER=true
44

Dockerfile-alpine

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ruby:3.3.6-alpine
1+
FROM ruby:3.4.2-alpine
22

33
ENV LANG=C.UTF-8
44
ENV ENABLE_SERVICE_WORKER=true

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
source 'https://rubygems.org'
2-
ruby '3.3.6'
2+
ruby '3.4.2'
33

44
gem 'activesupport', require: false
55
gem 'html-pipeline'

Gemfile.lock

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ GEM
3636
exifr (1.4.0)
3737
ffi (1.15.5)
3838
fspath (3.1.2)
39-
highline (2.0.3)
39+
highline (3.1.2)
40+
reline
4041
html-pipeline (2.14.3)
4142
activesupport (>= 2)
4243
nokogiri (>= 1.4)
@@ -53,6 +54,7 @@ GEM
5354
image_optim (~> 0.19)
5455
image_size (3.3.0)
5556
in_threads (1.6.0)
57+
io-console (0.8.0)
5658
logger (1.6.2)
5759
method_source (1.0.0)
5860
mini_portile2 (2.8.8)
@@ -61,7 +63,7 @@ GEM
6163
mustermann (3.0.3)
6264
ruby2_keywords (~> 0.0.1)
6365
newrelic_rpm (8.16.0)
64-
nokogiri (1.17.2)
66+
nokogiri (1.18.3)
6567
mini_portile2 (~> 2.8.2)
6668
racc (~> 1.4)
6769
options (2.3.2)
@@ -76,7 +78,7 @@ GEM
7678
byebug (~> 11.0)
7779
pry (>= 0.13, < 0.15)
7880
racc (1.8.1)
79-
rack (2.2.10)
81+
rack (2.2.11)
8082
rack-protection (3.2.0)
8183
base64 (>= 0.1.0)
8284
rack (~> 2.2, >= 2.2.4)
@@ -88,6 +90,8 @@ GEM
8890
rb-inotify (0.10.1)
8991
ffi (~> 1.0)
9092
redcarpet (3.6.0)
93+
reline (0.6.0)
94+
io-console (~> 0.5)
9195
rexml (3.3.9)
9296
rouge (1.11.1)
9397
rr (3.1.1)
@@ -126,14 +130,14 @@ GEM
126130
strings-ansi (0.2.0)
127131
terminal-table (3.0.2)
128132
unicode-display_width (>= 1.1.1, < 3)
129-
terser (1.2.4)
133+
terser (1.2.5)
130134
execjs (>= 0.3.0, < 3)
131135
thin (1.8.2)
132136
daemons (~> 1.0, >= 1.0.9)
133137
eventmachine (~> 1.0, >= 1.0.4)
134138
rack (>= 1, < 3)
135139
thor (1.3.2)
136-
tilt (2.4.0)
140+
tilt (2.6.0)
137141
tty-pager (0.14.0)
138142
strings (~> 0.2.0)
139143
tty-screen (~> 0.8)
@@ -187,7 +191,7 @@ DEPENDENCIES
187191
yajl-ruby
188192

189193
RUBY VERSION
190-
ruby 3.3.6p108
194+
ruby 3.4.2p28
191195

192196
BUNDLED WITH
193197
2.4.6

0 commit comments

Comments
 (0)