From 3cb42868ce14f5a5de962b09c6b86ea47a488a4b Mon Sep 17 00:00:00 2001 From: Stephen Hulme Date: Thu, 12 Feb 2026 15:20:00 +0000 Subject: [PATCH 1/6] build: install rails 7.1 --- Gemfile | 2 +- Gemfile.lock | 174 +++++++++++++++++++++++++++++++-------------------- 2 files changed, 107 insertions(+), 69 deletions(-) diff --git a/Gemfile b/Gemfile index c4661e77..a8352f83 100644 --- a/Gemfile +++ b/Gemfile @@ -17,7 +17,7 @@ gem 'mutex_m' gem 'oj', '~> 3.13' gem 'pmb-client', '0.1.0', github: 'sanger/pmb-client' gem 'puma' -gem 'rails', '~> 7.0.8', '>= 7.0.8.7' +gem 'rails', '~> 7.1.0' gem 'roo', '~> 2.8.0' gem 'sanger_barcode_format', github: 'sanger/sanger_barcode_format', branch: 'development' gem 'sassc-rails' diff --git a/Gemfile.lock b/Gemfile.lock index 1a039c70..c805e3dd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -15,72 +15,78 @@ GIT GEM remote: https://rubygems.org/ specs: - actioncable (7.0.10) - actionpack (= 7.0.10) - activesupport (= 7.0.10) + actioncable (7.1.6) + actionpack (= 7.1.6) + activesupport (= 7.1.6) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (7.0.10) - actionpack (= 7.0.10) - activejob (= 7.0.10) - activerecord (= 7.0.10) - activestorage (= 7.0.10) - activesupport (= 7.0.10) + zeitwerk (~> 2.6) + actionmailbox (7.1.6) + actionpack (= 7.1.6) + activejob (= 7.1.6) + activerecord (= 7.1.6) + activestorage (= 7.1.6) + activesupport (= 7.1.6) mail (>= 2.7.1) net-imap net-pop net-smtp - actionmailer (7.0.10) - actionpack (= 7.0.10) - actionview (= 7.0.10) - activejob (= 7.0.10) - activesupport (= 7.0.10) + actionmailer (7.1.6) + actionpack (= 7.1.6) + actionview (= 7.1.6) + activejob (= 7.1.6) + activesupport (= 7.1.6) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp - rails-dom-testing (~> 2.0) - actionpack (7.0.10) - actionview (= 7.0.10) - activesupport (= 7.0.10) + rails-dom-testing (~> 2.2) + actionpack (7.1.6) + actionview (= 7.1.6) + activesupport (= 7.1.6) + cgi + nokogiri (>= 1.8.5) racc - rack (~> 2.0, >= 2.2.4) + 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.10) - actionpack (= 7.0.10) - activerecord (= 7.0.10) - activestorage (= 7.0.10) - activesupport (= 7.0.10) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + actiontext (7.1.6) + actionpack (= 7.1.6) + activerecord (= 7.1.6) + activestorage (= 7.1.6) + activesupport (= 7.1.6) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.0.10) - activesupport (= 7.0.10) + actionview (7.1.6) + activesupport (= 7.1.6) builder (~> 3.1) - erubi (~> 1.4) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (7.0.10) - activesupport (= 7.0.10) + cgi + erubi (~> 1.11) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + activejob (7.1.6) + activesupport (= 7.1.6) globalid (>= 0.3.6) - activemodel (7.0.10) - activesupport (= 7.0.10) - activerecord (7.0.10) - activemodel (= 7.0.10) - activesupport (= 7.0.10) - activestorage (7.0.10) - actionpack (= 7.0.10) - activejob (= 7.0.10) - activerecord (= 7.0.10) - activesupport (= 7.0.10) + activemodel (7.1.6) + activesupport (= 7.1.6) + activerecord (7.1.6) + activemodel (= 7.1.6) + activesupport (= 7.1.6) + timeout (>= 0.4.0) + activestorage (7.1.6) + actionpack (= 7.1.6) + activejob (= 7.1.6) + activerecord (= 7.1.6) + activesupport (= 7.1.6) marcel (~> 1.0) - mini_mime (>= 1.1.0) - activesupport (7.0.10) + activesupport (7.1.6) 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) @@ -116,15 +122,18 @@ GEM capybara-selenium (0.0.6) capybara selenium-webdriver + cgi (0.5.1) childprocess (5.1.0) logger (~> 1.5) coderay (1.1.3) concurrent-ruby (1.3.4) + connection_pool (3.0.2) crass (1.0.6) csv (3.3.5) date (3.5.0) docile (1.4.0) drb (2.2.3) + erb (6.0.1) erubi (1.13.1) exception_notification (4.6.0) actionmailer (>= 5.2, < 9) @@ -164,6 +173,12 @@ GEM logger i18n (1.14.8) concurrent-ruby (~> 1.0) + io-console (0.8.2) + irb (1.17.0) + pp (>= 0.6.0) + prism (>= 1.3.0) + rdoc (>= 4.0.0) + reline (>= 0.4.2) jquery-rails (4.6.1) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) @@ -201,9 +216,9 @@ GEM method_source (1.1.0) mini_mime (1.1.5) minitest (5.27.0) - minitest-rails (7.0.1) - minitest (~> 5.10) - railties (~> 7.0.0) + minitest-rails (7.1.1) + minitest (~> 5.20) + railties (>= 7.1.0, < 8.0.0) minitest-rails-capybara (0.0.2) capybara minitest-rails @@ -237,33 +252,44 @@ GEM parser (3.3.10.1) ast (~> 2.4.1) racc + pp (0.6.3) + prettyprint + prettyprint (0.2.0) prism (1.9.0) pry (0.14.2) coderay (~> 1.1) method_source (~> 1.0) pry-rails (0.3.11) pry (>= 0.13.0) + psych (5.3.1) + date + stringio public_suffix (6.0.1) puma (7.2.0) nio4r (~> 2.0) racc (1.8.1) rack (2.2.21) + rack-session (1.0.2) + rack (< 3) rack-test (2.2.0) rack (>= 1.3) - rails (7.0.10) - actioncable (= 7.0.10) - actionmailbox (= 7.0.10) - actionmailer (= 7.0.10) - actionpack (= 7.0.10) - actiontext (= 7.0.10) - actionview (= 7.0.10) - activejob (= 7.0.10) - activemodel (= 7.0.10) - activerecord (= 7.0.10) - activestorage (= 7.0.10) - activesupport (= 7.0.10) + rackup (1.0.1) + rack (< 3) + webrick + rails (7.1.6) + actioncable (= 7.1.6) + actionmailbox (= 7.1.6) + actionmailer (= 7.1.6) + actionpack (= 7.1.6) + actiontext (= 7.1.6) + actionview (= 7.1.6) + activejob (= 7.1.6) + activemodel (= 7.1.6) + activerecord (= 7.1.6) + activestorage (= 7.1.6) + activesupport (= 7.1.6) bundler (>= 1.15.0) - railties (= 7.0.10) + railties (= 7.1.6) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) @@ -275,19 +301,28 @@ GEM rails-html-sanitizer (1.6.2) 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.10) - actionpack (= 7.0.10) - activesupport (= 7.0.10) - method_source + railties (7.1.6) + actionpack (= 7.1.6) + activesupport (= 7.1.6) + cgi + irb + rackup (>= 1.0.0) rake (>= 12.2) - thor (~> 1.0) - zeitwerk (~> 2.5) + thor (~> 1.0, >= 1.2.2) + tsort (>= 0.2) + zeitwerk (~> 2.6) rainbow (3.1.1) rake (13.3.1) rb-fsevent (0.11.2) rb-inotify (0.11.1) ffi (~> 1.0) + rdoc (7.2.0) + erb + psych (>= 4.0.0) + tsort regexp_parser (2.11.3) + reline (0.6.3) + io-console (~> 0.5) rexml (3.4.4) roo (2.8.3) nokogiri (~> 1) @@ -350,12 +385,14 @@ GEM actionpack (>= 6.1) activesupport (>= 6.1) sprockets (>= 3.0.0) + stringio (3.2.0) syslog (0.4.0) logger thor (1.4.0) tilt (2.1.0) timecop (0.9.10) timeout (0.4.4) + tsort (0.2.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) uglifier (4.2.1) @@ -363,6 +400,7 @@ GEM unicode-display_width (3.2.0) unicode-emoji (~> 4.1) unicode-emoji (4.2.0) + webrick (1.9.2) websocket (1.2.11) websocket-driver (0.8.0) base64 @@ -405,7 +443,7 @@ DEPENDENCIES pmb-client (= 0.1.0)! pry-rails puma - rails (~> 7.0.8, >= 7.0.8.7) + rails (~> 7.1.0) rails-controller-testing roo (~> 2.8.0) rubocop From 0cd6aec9f7a0e2ede8baa46e9d4a0b83cde5a04f Mon Sep 17 00:00:00 2001 From: Stephen Hulme Date: Thu, 12 Feb 2026 15:20:26 +0000 Subject: [PATCH 2/6] build: remove old framework files --- .../new_framework_defaults_5_2.rb | 40 ----- .../new_framework_defaults_7_0.rb | 144 ------------------ 2 files changed, 184 deletions(-) delete mode 100644 config/initializers/new_framework_defaults_5_2.rb delete mode 100644 config/initializers/new_framework_defaults_7_0.rb diff --git a/config/initializers/new_framework_defaults_5_2.rb b/config/initializers/new_framework_defaults_5_2.rb deleted file mode 100644 index c300f213..00000000 --- a/config/initializers/new_framework_defaults_5_2.rb +++ /dev/null @@ -1,40 +0,0 @@ -# frozen_string_literal: true - -# Be sure to restart your server when you modify this file. -# -# This file contains migration options to ease your Rails 5.2 upgrade. -# -# Once upgraded flip defaults one by one to migrate to the new default. -# -# Read the Guide for Upgrading Ruby on Rails for more info on each option. - -# Make Active Record use stable #cache_key alongside new #cache_version method. -# This is needed for recyclable cache keys. -# Rails.application.config.active_record.cache_versioning = true - -# Use AES-256-GCM authenticated encryption for encrypted cookies. -# Also, embed cookie expiry in signed or encrypted cookies for increased security. -# -# This option is not backwards compatible with earlier Rails versions. -# It's best enabled when your entire app is migrated and stable on 5.2. -# -# Existing cookies will be converted on read then written with the new scheme. -# Rails.application.config.action_dispatch.use_authenticated_cookie_encryption = true - -# Use AES-256-GCM authenticated encryption as default cipher for encrypting messages -# instead of AES-256-CBC, when use_authenticated_message_encryption is set to true. -# Rails.application.config.active_support.use_authenticated_message_encryption = true - -# Add default protection from forgery to ActionController::Base instead of in -# ApplicationController. -# Rails.application.config.action_controller.default_protect_from_forgery = true - -# Store boolean values are in sqlite3 databases as 1 and 0 instead of 't' and -# 'f' after migrating old data. -# Rails.application.config.active_record.sqlite3.represent_boolean_as_integer = true - -# Use SHA-1 instead of MD5 to generate non-sensitive digests, such as the ETag header. -# Rails.application.config.active_support.use_sha1_digests = true - -# Make `form_with` generate id attributes for any generated HTML tags. -# Rails.application.config.action_view.form_with_generates_ids = true diff --git a/config/initializers/new_framework_defaults_7_0.rb b/config/initializers/new_framework_defaults_7_0.rb deleted file mode 100644 index ce2d234f..00000000 --- a/config/initializers/new_framework_defaults_7_0.rb +++ /dev/null @@ -1,144 +0,0 @@ -# frozen_string_literal: true - -# Be sure to restart your server when you modify this file. -# -# This file eases your Rails 7.0 framework defaults upgrade. -# -# Uncomment each configuration one by one to switch to the new default. -# Once your application is ready to run with all new defaults, you can remove -# this file and set the `config.load_defaults` to `7.0`. -# -# Read the Guide for Upgrading Ruby on Rails for more info on each option. -# https://guides.rubyonrails.org/upgrading_ruby_on_rails.html - -# `button_to` view helper will render `