Skip to content

Commit b2925df

Browse files
authored
Merge branch 'main' into sass
2 parents a6e6116 + fff6c3c commit b2925df

62 files changed

Lines changed: 298 additions & 86 deletions

Some content is hidden

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

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
steps:
1414
- uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0
1515
- name: Set up Ruby
16-
uses: ruby/setup-ruby@8aeb6ff8030dd539317f8e1769a044873b56ea71 # v1.268.0
16+
uses: ruby/setup-ruby@09a7688d3b55cf0e976497ff046b70949eeaccfd # v1.288.0
1717
with:
1818
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
1919
- name: Run tests

.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@8aeb6ff8030dd539317f8e1769a044873b56ea71 # v1.268.0
14+
uses: ruby/setup-ruby@09a7688d3b55cf0e976497ff046b70949eeaccfd # v1.288.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@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
1313
- name: Set up Ruby
14-
uses: ruby/setup-ruby@8aeb6ff8030dd539317f8e1769a044873b56ea71 # v1.268.0
14+
uses: ruby/setup-ruby@09a7688d3b55cf0e976497ff046b70949eeaccfd # v1.288.0
1515
with:
1616
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
1717
- name: Run tests

.gitignore

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,5 @@ docs/**/*
1212
*.tar.bz2
1313
*.tar.gz
1414
*.zip
15-
16-
# SCSS manually compiled from ERB.
17-
assets/stylesheets/global/_icons.scss
1815
assets/stylesheets/components/_environment.scss
16+
assets/stylesheets/global/_icons.scss

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.4.7
1+
3.4.8

.tool-versions

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

COPYRIGHT

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright 2013-2025 Thibaut Courouble and other contributors
1+
Copyright 2013-2026 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: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ RUN apt-get update && \
1111

1212
COPY Gemfile Gemfile.lock Rakefile /devdocs/
1313

14-
RUN bundle install --system && \
14+
RUN bundle config set path.system true && \
15+
bundle install && \
1516
rm -rf ~/.gem /root/.bundle/cache /usr/local/bundle/cache
1617

1718
COPY . /devdocs

Dockerfile-alpine

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ COPY . /devdocs
99

1010
RUN apk --update add nodejs build-base libstdc++ gzip git zlib-dev libcurl && \
1111
gem install bundler && \
12-
bundle install --system --without test && \
12+
bundle config set path.system true && \
13+
bundle config set without 'test' && \
14+
bundle install && \
1315
thor docs:download --all && \
1416
thor assets:compile && \
1517
apk del gzip build-base git zlib-dev && \

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.4.7'
2+
ruby '3.4.8'
33

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

0 commit comments

Comments
 (0)