From 45a251e30119795cec95dbc3bc80f34eb5cdc129 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Nov 2024 16:17:49 +0000 Subject: [PATCH 1/2] Bump rails from 7.0.8.6 to 7.1.5 Bumps [rails](https://github.com/rails/rails) from 7.0.8.6 to 7.1.5. - [Release notes](https://github.com/rails/rails/releases) - [Commits](https://github.com/rails/rails/compare/v7.0.8.6...v7.1.5) --- updated-dependencies: - dependency-name: rails dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 164 ++++++++++++++++++++++++++++++--------------------- 2 files changed, 99 insertions(+), 67 deletions(-) diff --git a/Gemfile b/Gemfile index a46f6c78d..d90f8fd28 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ ruby File.open(File.expand_path(".ruby-version", File.dirname(__FILE__))) { |f| git_source(:github) { |name| "https://github.com/#{name}.git" } -gem 'rails', '~> 7.0.8' +gem 'rails', '~> 7.1.5' gem 'sprockets', '< 4' # Sprockets 4 pain is not worth it. # Authentication diff --git a/Gemfile.lock b/Gemfile.lock index 0716edaa4..26ac3ed95 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -57,74 +57,86 @@ GEM base64 (~> 0.2.0) faraday (>= 1.0, < 3.0.0) faraday-retry (>= 1.0, < 3.0.0) - actioncable (7.0.8.6) - actionpack (= 7.0.8.6) - activesupport (= 7.0.8.6) + actioncable (7.1.5) + actionpack (= 7.1.5) + activesupport (= 7.1.5) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (7.0.8.6) - actionpack (= 7.0.8.6) - activejob (= 7.0.8.6) - activerecord (= 7.0.8.6) - activestorage (= 7.0.8.6) - activesupport (= 7.0.8.6) + zeitwerk (~> 2.6) + actionmailbox (7.1.5) + actionpack (= 7.1.5) + activejob (= 7.1.5) + activerecord (= 7.1.5) + activestorage (= 7.1.5) + activesupport (= 7.1.5) mail (>= 2.7.1) net-imap net-pop net-smtp - actionmailer (7.0.8.6) - actionpack (= 7.0.8.6) - actionview (= 7.0.8.6) - activejob (= 7.0.8.6) - activesupport (= 7.0.8.6) + actionmailer (7.1.5) + actionpack (= 7.1.5) + actionview (= 7.1.5) + activejob (= 7.1.5) + activesupport (= 7.1.5) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp - rails-dom-testing (~> 2.0) - actionpack (7.0.8.6) - actionview (= 7.0.8.6) - activesupport (= 7.0.8.6) - rack (~> 2.0, >= 2.2.4) + rails-dom-testing (~> 2.2) + actionpack (7.1.5) + actionview (= 7.1.5) + activesupport (= 7.1.5) + 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.6) - actionpack (= 7.0.8.6) - activerecord (= 7.0.8.6) - activestorage (= 7.0.8.6) - activesupport (= 7.0.8.6) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + actiontext (7.1.5) + actionpack (= 7.1.5) + activerecord (= 7.1.5) + activestorage (= 7.1.5) + activesupport (= 7.1.5) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.0.8.6) - activesupport (= 7.0.8.6) + actionview (7.1.5) + activesupport (= 7.1.5) builder (~> 3.1) - erubi (~> 1.4) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (7.0.8.6) - activesupport (= 7.0.8.6) + erubi (~> 1.11) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + activejob (7.1.5) + activesupport (= 7.1.5) globalid (>= 0.3.6) - activemodel (7.0.8.6) - activesupport (= 7.0.8.6) + activemodel (7.1.5) + activesupport (= 7.1.5) activemodel-serializers-xml (1.0.3) activemodel (>= 5.0.0.a) activesupport (>= 5.0.0.a) builder (~> 3.1) - activerecord (7.0.8.6) - activemodel (= 7.0.8.6) - activesupport (= 7.0.8.6) - activestorage (7.0.8.6) - actionpack (= 7.0.8.6) - activejob (= 7.0.8.6) - activerecord (= 7.0.8.6) - activesupport (= 7.0.8.6) + activerecord (7.1.5) + activemodel (= 7.1.5) + activesupport (= 7.1.5) + timeout (>= 0.4.0) + activestorage (7.1.5) + actionpack (= 7.1.5) + activejob (= 7.1.5) + activerecord (= 7.1.5) + activesupport (= 7.1.5) marcel (~> 1.0) - mini_mime (>= 1.1.0) - activesupport (7.0.8.6) + activesupport (7.1.5) + 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) acts_as_list (0.9.19) activerecord (>= 3.0) @@ -204,6 +216,8 @@ GEM execjs (~> 2.0) base64 (0.2.0) bcrypt (3.1.20) + benchmark (0.4.0) + bigdecimal (3.1.8) breadcrumbs_on_rails (3.0.1) builder (3.3.0) bullet (8.0.0) @@ -310,6 +324,7 @@ GEM dotenv-rails (2.8.1) dotenv (= 2.8.1) railties (>= 3.2) + drb (2.2.1) equalizer (0.0.11) erubi (1.13.0) execjs (2.10.0) @@ -365,6 +380,10 @@ GEM importmap-rails (1.1.6) actionpack (>= 6.0.0) railties (>= 6.0.0) + io-console (0.7.2) + irb (1.14.1) + rdoc (>= 4.0.0) + reline (>= 0.4.2) jmespath (1.6.2) jquery-datatables-rails (3.4.0) actionpack (>= 3.1) @@ -407,7 +426,7 @@ GEM method_source (1.1.0) mini_magick (4.12.0) mini_mime (1.1.5) - mini_portile2 (2.8.7) + mini_portile2 (2.8.8) minitest (5.25.1) monetize (1.12.0) money (~> 6.12) @@ -418,6 +437,7 @@ GEM monetize (~> 1.9) money (~> 6.13) railties (>= 3.0) + mutex_m (0.2.0) nested_form (0.3.2) net-http (0.4.1) uri @@ -469,6 +489,8 @@ GEM method_source (~> 1.0) pry-rails (0.3.11) pry (>= 0.13.0) + psych (5.2.0) + stringio public_suffix (5.1.1) pundit (2.4.0) activesupport (>= 3.0.0) @@ -478,20 +500,23 @@ GEM rack (< 3) rack-test (2.1.0) rack (>= 1.3) - rails (7.0.8.6) - actioncable (= 7.0.8.6) - actionmailbox (= 7.0.8.6) - actionmailer (= 7.0.8.6) - actionpack (= 7.0.8.6) - actiontext (= 7.0.8.6) - actionview (= 7.0.8.6) - activejob (= 7.0.8.6) - activemodel (= 7.0.8.6) - activerecord (= 7.0.8.6) - activestorage (= 7.0.8.6) - activesupport (= 7.0.8.6) + rackup (1.0.1) + rack (< 3) + webrick + rails (7.1.5) + actioncable (= 7.1.5) + actionmailbox (= 7.1.5) + actionmailer (= 7.1.5) + actionpack (= 7.1.5) + actiontext (= 7.1.5) + actionview (= 7.1.5) + activejob (= 7.1.5) + activemodel (= 7.1.5) + activerecord (= 7.1.5) + activestorage (= 7.1.5) + activesupport (= 7.1.5) bundler (>= 1.15.0) - railties (= 7.0.8.6) + railties (= 7.1.5) rails-dom-testing (2.2.0) activesupport (>= 5.0.0) minitest @@ -509,25 +534,30 @@ GEM nested_form (~> 0.3) rails (>= 6.0, < 8) turbo-rails (>= 1.0, < 3) - railties (7.0.8.6) - actionpack (= 7.0.8.6) - activesupport (= 7.0.8.6) - method_source + railties (7.1.5) + actionpack (= 7.1.5) + activesupport (= 7.1.5) + 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) raindrops (0.20.1) rake (13.2.1) rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) + rdoc (6.8.1) + psych (>= 4.0.0) recaptcha (5.17.0) redis (5.3.0) redis-client (>= 0.22.0) redis-client (0.22.2) connection_pool regexp_parser (2.9.2) + reline (0.5.11) + io-console (~> 0.5) request_store (1.7.0) rack (>= 1.4) responders (3.1.1) @@ -603,6 +633,7 @@ GEM sprockets (> 3.0) sprockets-rails tilt + securerandom (0.3.2) select2-rails (4.0.13) shoulda-matchers (6.4.0) activesupport (>= 5.2.0) @@ -643,6 +674,7 @@ GEM state_machines (0.6.0) stimulus-rails (1.2.1) railties (>= 6.0.0) + stringio (3.1.2) stripe (8.5.0) teaspoon (1.2.2) railties (>= 3.2.5) @@ -759,7 +791,7 @@ DEPENDENCIES pry pry-rails pundit - rails (~> 7.0.8) + rails (~> 7.1.5) rails-assets-datetimepicker (= 2.5.20)! rails-i18n rails_admin (< 4) From 1f6e544ada234f5ba59686761bdfa2d0e30d3b4c Mon Sep 17 00:00:00 2001 From: Robin Dunlop Date: Tue, 19 Nov 2024 10:48:23 -0600 Subject: [PATCH 2/2] update schema.rb to match rails 7.1 output --- db/schema.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/schema.rb b/db/schema.rb index 090e71f8c..4adda6238 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema[7.0].define(version: 2024_11_10_154540) do +ActiveRecord::Schema[7.1].define(version: 2024_11_10_154540) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql"