Skip to content

Commit

Permalink
Merge pull request #5395 from DFE-Digital/dependabot/bundler/nokogiri…
Browse files Browse the repository at this point in the history
…-1.18.0

Bump nokogiri from 1.17.2 to 1.18.0
  • Loading branch information
cwrw authored Dec 30, 2024
2 parents 6a9eb4f + 50b445c commit 4acf35d
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/boot.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ bin/rails db:seed

echo "Installing documentation dependencies..."
cd docs
gem install bundler -v 2.4.6 # Must be explicitly specified or we get an error on the subsequent bundle install.
gem install bundler -v 2.6.2 # Must be explicitly specified or we get an error on the subsequent bundle install.
bundle install

echo "Building documentation..."
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ RUN apk -U upgrade && \
gem update --system && \
find / -wholename '*default/bundler-*.gemspec' -delete && \
rm -rf /usr/local/bin/bundle && \
gem install bundler -v 2.4.6 && \
gem install bundler -v 2.6.2 && \
bundler -v && \
bundle config set no-cache 'true' && \
bundle config set no-binstubs 'true' && \
Expand Down
10 changes: 5 additions & 5 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -366,11 +366,11 @@ GEM
net-protocol
nio4r (2.7.3)
nkf (0.2.0)
nokogiri (1.17.2-arm64-darwin)
nokogiri (1.18.0-arm64-darwin)
racc (~> 1.4)
nokogiri (1.17.2-x86_64-darwin)
nokogiri (1.18.0-x86_64-darwin)
racc (~> 1.4)
nokogiri (1.17.2-x86_64-linux)
nokogiri (1.18.0-x86_64-linux-gnu)
racc (~> 1.4)
nori (2.7.0)
bigdecimal
Expand Down Expand Up @@ -712,7 +712,7 @@ PLATFORMS
arm64-darwin-24
x86_64-darwin-22
x86_64-darwin-23
x86_64-linux
x86_64-linux-gnu

DEPENDENCIES
active_record_extended
Expand Down Expand Up @@ -810,4 +810,4 @@ RUBY VERSION
ruby 3.2.4p170

BUNDLED WITH
2.4.14
2.6.2
2 changes: 1 addition & 1 deletion docs/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -215,4 +215,4 @@ RUBY VERSION
ruby 3.2.4p170

BUNDLED WITH
2.4.6
2.6.2

0 comments on commit 4acf35d

Please sign in to comment.