Skip to content

Commit

Permalink
Merge pull request #208 from alphagov/ruby-rails-up
Browse files Browse the repository at this point in the history
Upgrade Ruby and rails
  • Loading branch information
csutter authored Feb 5, 2024
2 parents 6237d24 + 2c97539 commit 6748b2b
Show file tree
Hide file tree
Showing 4 changed files with 48 additions and 30 deletions.
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.2.2
3.2.3
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG ruby_version=3.2.2
ARG ruby_version=3.2.3
ARG base_image=ghcr.io/alphagov/govuk-ruby-base:$ruby_version
ARG builder_image=ghcr.io/alphagov/govuk-ruby-builder:$ruby_version

Expand Down
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
source "https://rubygems.org"
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby "3.2.2"
ruby "3.2.3"

RAILS_GEMS_VERSION = "7.0.7.2".freeze
RAILS_GEMS_VERSION = "7.1.3".freeze
gem "actionpack", RAILS_GEMS_VERSION
gem "activemodel", RAILS_GEMS_VERSION
gem "activesupport", RAILS_GEMS_VERSION
Expand Down
70 changes: 44 additions & 26 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,31 +1,40 @@
GEM
remote: https://rubygems.org/
specs:
actionpack (7.0.7.2)
actionview (= 7.0.7.2)
activesupport (= 7.0.7.2)
rack (~> 2.0, >= 2.2.4)
actionpack (7.1.3)
actionview (= 7.1.3)
activesupport (= 7.1.3)
nokogiri (>= 1.8.5)
racc
rack (>= 2.2.4)
rack-session (>= 1.0.1)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actionview (7.0.7.2)
activesupport (= 7.0.7.2)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
actionview (7.1.3)
activesupport (= 7.1.3)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
activemodel (7.0.7.2)
activesupport (= 7.0.7.2)
activesupport (7.0.7.2)
erubi (~> 1.11)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
activemodel (7.1.3)
activesupport (= 7.1.3)
activesupport (7.1.3)
base64
bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
connection_pool (>= 2.2.5)
drb
i18n (>= 1.6, < 2)
minitest (>= 5.1)
mutex_m
tzinfo (~> 2.0)
addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
amq-protocol (2.3.2)
ast (2.4.2)
base64 (0.2.0)
bigdecimal (3.1.6)
bootsnap (1.18.3)
msgpack (~> 1.2)
brakeman (6.1.2)
Expand All @@ -44,12 +53,15 @@ GEM
regexp_parser (>= 1.5, < 3.0)
xpath (~> 3.2)
concurrent-ruby (1.2.3)
connection_pool (2.4.1)
crass (1.0.6)
debug (1.9.1)
irb (~> 1.10)
reline (>= 0.3.8)
diff-lcs (1.5.1)
docile (1.4.0)
drb (2.2.0)
ruby2_keywords
erubi (1.12.0)
faraday (2.9.0)
faraday-net_http (>= 2.0, < 3.2)
Expand Down Expand Up @@ -155,11 +167,11 @@ GEM
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
matrix (0.4.2)
method_source (1.0.0)
mini_mime (1.1.5)
minitest (5.21.2)
msgpack (1.7.2)
multi_json (1.15.0)
mutex_m (0.2.0)
net-http (0.4.1)
uri
nio4r (2.7.0)
Expand Down Expand Up @@ -380,22 +392,28 @@ GEM
rack (2.2.8)
rack-proxy (0.7.7)
rack
rack-session (1.0.2)
rack (< 3)
rack-test (2.1.0)
rack (>= 1.3)
rackup (1.0.0)
rack (< 3)
webrick
rails-dom-testing (2.2.0)
activesupport (>= 5.0.0)
minitest
nokogiri (>= 1.6)
rails-html-sanitizer (1.6.0)
loofah (~> 2.21)
nokogiri (~> 1.14)
railties (7.0.7.2)
actionpack (= 7.0.7.2)
activesupport (= 7.0.7.2)
method_source
railties (7.1.3)
actionpack (= 7.1.3)
activesupport (= 7.1.3)
irb
rackup (>= 1.0.0)
rake (>= 12.2)
thor (~> 1.0)
zeitwerk (~> 2.5)
thor (~> 1.0, >= 1.2.2)
zeitwerk (~> 2.6)
rainbow (3.1.1)
rake (13.1.0)
rbtree (0.4.6)
Expand Down Expand Up @@ -511,9 +529,9 @@ PLATFORMS
x86_64-linux

DEPENDENCIES
actionpack (= 7.0.7.2)
activemodel (= 7.0.7.2)
activesupport (= 7.0.7.2)
actionpack (= 7.1.3)
activemodel (= 7.1.3)
activesupport (= 7.1.3)
bootsnap
brakeman
debug
Expand All @@ -525,14 +543,14 @@ DEPENDENCIES
json_schemer
jsonpath
loofah
railties (= 7.0.7.2)
railties (= 7.1.3)
rspec-rails
rubocop-govuk
simplecov
timecop

RUBY VERSION
ruby 3.2.2p53
ruby 3.2.3p157

BUNDLED WITH
2.4.10

0 comments on commit 6748b2b

Please sign in to comment.