Skip to content

Bump rails to 7.1.5.2 #154

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bshand merged 10 commits into from
Sep 10, 2025
Merged

Bump rails to 7.1.5.2 #154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
040141e
Bump paper_trail to 16.0.0
bshand Aug 5, 2025
ac796af
Bump rails to 7.1.5.1
bshand Aug 4, 2025
ba1b427
Update configuration files to more closely match Rails 7.1 defaults
bshand Aug 6, 2025
53f39d4
Use Rails 7.1 application defaults [NDRS2-3177]
bshand Aug 6, 2025
31a2eb1
Fix deprecation warning on Rails 7.1
bshand Aug 6, 2025
2d86e04
Fix brittle test
bshand Aug 7, 2025
a57c1a7
Fix brittle test
bshand Aug 7, 2025
7a1a38e
Bump rails to 7.1.5.2
bshand Sep 9, 2025
4dfcef4
Fix logging for weekly tasks on Rails 7.1
bshand Sep 9, 2025
585a254
Use Rails 7.1 convention for eager loading lib directory
bshand Sep 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ source 'https://rubygems.org'
# README) is available at:
# https://github.com/NHSDigital/activemodel-caution.git

gem 'activemodel-caution', '7.0.8' # Supports rails ~> 7.0.8.0
gem 'rails', '~> 7.0.4', '>= 7.0.8.1'
gem 'activemodel-caution', '7.1.5.0' # Supports rails ~> 7.1.5.0
gem 'rails', '~> 7.1.5', '>= 7.1.5.1'
# Fixes uninitialized constant ActiveSupport::LoggerThreadSafeLevel::Logger on Rails 7.0x
# and earlier. See https://github.com/rails/rails/issues/54260.
gem 'concurrent-ruby', '1.3.4'
Expand Down Expand Up @@ -47,7 +47,7 @@ gem 'cancancan', '~> 3.0'
gem 'cocoon'
gem 'devise', '~> 4.7', '>= 4.7.1'
gem 'highline'
gem 'paper_trail', '~> 12.0'
gem 'paper_trail', '~> 16.0'
gem 'paper_trail-association_tracking'
gem 'possibly'
gem 'pry'
Expand Down
201 changes: 118 additions & 83 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,76 +2,88 @@ GEM
remote: https://rubygems.org/
specs:
Ascii85 (2.0.1)
actioncable (7.0.8.7)
actionpack (= 7.0.8.7)
activesupport (= 7.0.8.7)
actioncable (7.1.5.2)
actionpack (= 7.1.5.2)
activesupport (= 7.1.5.2)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailbox (7.0.8.7)
actionpack (= 7.0.8.7)
activejob (= 7.0.8.7)
activerecord (= 7.0.8.7)
activestorage (= 7.0.8.7)
activesupport (= 7.0.8.7)
zeitwerk (~> 2.6)
actionmailbox (7.1.5.2)
actionpack (= 7.1.5.2)
activejob (= 7.1.5.2)
activerecord (= 7.1.5.2)
activestorage (= 7.1.5.2)
activesupport (= 7.1.5.2)
mail (>= 2.7.1)
net-imap
net-pop
net-smtp
actionmailer (7.0.8.7)
actionpack (= 7.0.8.7)
actionview (= 7.0.8.7)
activejob (= 7.0.8.7)
activesupport (= 7.0.8.7)
actionmailer (7.1.5.2)
actionpack (= 7.1.5.2)
actionview (= 7.1.5.2)
activejob (= 7.1.5.2)
activesupport (= 7.1.5.2)
mail (~> 2.5, >= 2.5.4)
net-imap
net-pop
net-smtp
rails-dom-testing (~> 2.0)
actionpack (7.0.8.7)
actionview (= 7.0.8.7)
activesupport (= 7.0.8.7)
rack (~> 2.0, >= 2.2.4)
rails-dom-testing (~> 2.2)
actionpack (7.1.5.2)
actionview (= 7.1.5.2)
activesupport (= 7.1.5.2)
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)
actiontext (7.0.8.7)
actionpack (= 7.0.8.7)
activerecord (= 7.0.8.7)
activestorage (= 7.0.8.7)
activesupport (= 7.0.8.7)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
actiontext (7.1.5.2)
actionpack (= 7.1.5.2)
activerecord (= 7.1.5.2)
activestorage (= 7.1.5.2)
activesupport (= 7.1.5.2)
globalid (>= 0.6.0)
nokogiri (>= 1.8.5)
actionview (7.0.8.7)
activesupport (= 7.0.8.7)
actionview (7.1.5.2)
activesupport (= 7.1.5.2)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
activejob (7.0.8.7)
activesupport (= 7.0.8.7)
erubi (~> 1.11)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
activejob (7.1.5.2)
activesupport (= 7.1.5.2)
globalid (>= 0.3.6)
activemodel (7.0.8.7)
activesupport (= 7.0.8.7)
activemodel-caution (7.0.8.0)
actionpack (~> 7.0.8.0)
activemodel (~> 7.0.8.0)
activerecord (~> 7.0.8.0)
activesupport (~> 7.0.8.0)
railties (~> 7.0.8.0)
activerecord (7.0.8.7)
activemodel (= 7.0.8.7)
activesupport (= 7.0.8.7)
activestorage (7.0.8.7)
actionpack (= 7.0.8.7)
activejob (= 7.0.8.7)
activerecord (= 7.0.8.7)
activesupport (= 7.0.8.7)
activemodel (7.1.5.2)
activesupport (= 7.1.5.2)
activemodel-caution (7.1.5.0)
actionpack (~> 7.1.5.0)
activemodel (~> 7.1.5.0)
activerecord (~> 7.1.5.0)
activesupport (~> 7.1.5.0)
railties (~> 7.1.5.0)
activerecord (7.1.5.2)
activemodel (= 7.1.5.2)
activesupport (= 7.1.5.2)
timeout (>= 0.4.0)
activestorage (7.1.5.2)
actionpack (= 7.1.5.2)
activejob (= 7.1.5.2)
activerecord (= 7.1.5.2)
activesupport (= 7.1.5.2)
marcel (~> 1.0)
mini_mime (>= 1.1.0)
activesupport (7.0.8.7)
activesupport (7.1.5.2)
base64
benchmark (>= 0.3)
bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
connection_pool (>= 2.2.5)
drb
i18n (>= 1.6, < 2)
logger (>= 1.4.2)
minitest (>= 5.1)
mutex_m
securerandom (>= 0.3)
tzinfo (~> 2.0)
addressable (2.8.7)
public_suffix (>= 2.0.2, < 7.0)
Expand All @@ -83,6 +95,7 @@ GEM
multi_json (~> 1.0)
base64 (0.2.0)
bcrypt (3.1.20)
benchmark (0.4.1)
bigdecimal (3.1.8)
bindex (0.8.1)
bio-vcf (0.9.5)
Expand Down Expand Up @@ -138,6 +151,7 @@ GEM
execjs
coffee-script-source (1.12.2)
concurrent-ruby (1.3.4)
connection_pool (2.5.3)
crass (1.0.6)
csv (3.3.0)
daemons (1.4.1)
Expand All @@ -160,9 +174,11 @@ GEM
docx (0.8.0)
nokogiri (~> 1.13, >= 1.13.0)
rubyzip (~> 2.0)
drb (2.2.3)
em-websocket (0.5.3)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0)
erb (5.0.2)
erubi (1.13.0)
eventmachine (1.2.7)
execjs (2.10.0)
Expand Down Expand Up @@ -210,6 +226,10 @@ GEM
i18n (1.14.6)
concurrent-ruby (~> 1.0)
io-console (0.7.2)
irb (1.15.2)
pp (>= 0.6.0)
rdoc (>= 4.0.0)
reline (>= 0.4.2)
jquery-rails (4.6.0)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
Expand Down Expand Up @@ -249,6 +269,7 @@ GEM
msworddoc-extractor (0.2.0)
ruby-ole
multi_json (1.15.0)
mutex_m (0.3.0)
ndr_authenticate (0.3.4)
devise
devise_saml_authenticatable (~> 1.9)
Expand Down Expand Up @@ -281,12 +302,12 @@ GEM
simplecov
unicode-display_width (>= 1.3.3)
with_clean_rbenv
ndr_error (2.3.1)
ndr_error (2.3.2)
ndr_ui
net-imap
net-pop
net-smtp
rails (>= 6.0, < 7.1)
rails (>= 6.1, < 7.3)
will_paginate
ndr_import (11.2.1)
activemodel
Expand All @@ -310,10 +331,10 @@ GEM
ndr_support (5.10.4)
activerecord (>= 7.0, < 8.1)
activesupport (>= 7.0, < 8.1)
ndr_ui (3.3.1)
ndr_ui (3.3.2)
bootstrap-sass (~> 3.4.1)
jquery-rails (>= 4.1.0)
rails (>= 6.0, < 7.1)
rails (>= 6.1, < 7.3)
sprockets (>= 4.0)
sprockets-rails (>= 3.0.0)
ndr_workflow (1.2.4)
Expand Down Expand Up @@ -354,10 +375,10 @@ GEM
nokogiri (~> 1.10)
ruby-ole (~> 1.2)
orm_adapter (0.5.0)
paper_trail (12.3.0)
activerecord (>= 5.2)
request_store (~> 1.1)
paper_trail-association_tracking (2.2.1)
paper_trail (16.0.0)
activerecord (>= 6.1)
request_store (~> 1.4)
paper_trail-association_tracking (2.3.0)
paper_trail (>= 12.0)
parallel (1.26.3)
parser (3.3.6.0)
Expand All @@ -372,6 +393,9 @@ GEM
pg (1.4.6)
possibly (1.0.1)
power_assert (2.0.4)
pp (0.6.2)
prettyprint
prettyprint (0.2.0)
prometheus-client (4.0.0)
pry (0.15.0)
coderay (~> 1.1)
Expand All @@ -387,47 +411,56 @@ GEM
puma (>= 5.0)
rack
racc (1.8.1)
rack (2.2.17)
rack (3.2.0)
rack-mini-profiler (3.3.1)
rack (>= 1.2.0)
rack-proxy (0.7.7)
rack
rack-session (2.1.1)
base64 (>= 0.1.0)
rack (>= 3.0.0)
rack-test (2.1.0)
rack (>= 1.3)
rackup (2.2.1)
rack (>= 3)
railroady (1.6.0)
rails (7.0.8.7)
actioncable (= 7.0.8.7)
actionmailbox (= 7.0.8.7)
actionmailer (= 7.0.8.7)
actionpack (= 7.0.8.7)
actiontext (= 7.0.8.7)
actionview (= 7.0.8.7)
activejob (= 7.0.8.7)
activemodel (= 7.0.8.7)
activerecord (= 7.0.8.7)
activestorage (= 7.0.8.7)
activesupport (= 7.0.8.7)
rails (7.1.5.2)
actioncable (= 7.1.5.2)
actionmailbox (= 7.1.5.2)
actionmailer (= 7.1.5.2)
actionpack (= 7.1.5.2)
actiontext (= 7.1.5.2)
actionview (= 7.1.5.2)
activejob (= 7.1.5.2)
activemodel (= 7.1.5.2)
activerecord (= 7.1.5.2)
activestorage (= 7.1.5.2)
activesupport (= 7.1.5.2)
bundler (>= 1.15.0)
railties (= 7.0.8.7)
railties (= 7.1.5.2)
rails-dom-testing (2.2.0)
activesupport (>= 5.0.0)
minitest
nokogiri (>= 1.6)
rails-html-sanitizer (1.6.1)
loofah (~> 2.21)
nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
railties (7.0.8.7)
actionpack (= 7.0.8.7)
activesupport (= 7.0.8.7)
method_source
railties (7.1.5.2)
actionpack (= 7.1.5.2)
activesupport (= 7.1.5.2)
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.2.1)
rb-fsevent (0.11.2)
rb-inotify (0.11.1)
ffi (~> 1.0)
rdoc (6.14.2)
erb
psych (>= 4.0.0)
regexp-examples (1.6.0)
regexp_property_values (~> 1.5)
regexp_parser (2.9.3)
Expand Down Expand Up @@ -488,6 +521,7 @@ GEM
sprockets (> 3.0)
sprockets-rails
tilt
securerandom (0.4.1)
selenium-webdriver (4.34.0)
base64 (~> 0.2)
logger (~> 1.4)
Expand Down Expand Up @@ -543,7 +577,8 @@ GEM
railties (>= 5.2)
semantic_range (>= 2.3.0)
websocket (1.2.11)
websocket-driver (0.7.6)
websocket-driver (0.8.0)
base64
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
will_paginate (4.0.1)
Expand All @@ -562,7 +597,7 @@ PLATFORMS
x86_64-linux

DEPENDENCIES
activemodel-caution (= 7.0.8)
activemodel-caution (= 7.1.5.0)
bootstrap-table-rails (~> 1.20.2)
byebug
cancancan (~> 3.0)
Expand Down Expand Up @@ -599,7 +634,7 @@ DEPENDENCIES
ndr_ui (~> 3.3)
ndr_workflow (~> 1.2, >= 1.2.2)
nokogiri (~> 1.11)
paper_trail (~> 12.0)
paper_trail (~> 16.0)
paper_trail-association_tracking
parser
pg (~> 1.4.6)
Expand All @@ -611,7 +646,7 @@ DEPENDENCIES
puma-daemon
rack-mini-profiler
railroady
rails (~> 7.0.4, >= 7.0.8.1)
rails (~> 7.1.5, >= 7.1.5.1)
rainbow
regexp-examples
sass-rails
Expand Down
2 changes: 1 addition & 1 deletion bin/setup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ require 'fileutils'
APP_ROOT = File.expand_path('..', __dir__)

def system!(*args)
system(*args) || abort("\n== Command #{args} failed ==")
system(*args, exception: true)
end

FileUtils.chdir APP_ROOT do
Expand Down
Loading
Loading