From 117ab587ebafb01db91996d906c22861160e857b Mon Sep 17 00:00:00 2001 From: Christina Chortaria Date: Tue, 24 Sep 2024 17:37:28 -0400 Subject: [PATCH] [#59] update rails to 7.1 --- Gemfile | 9 +- Gemfile.lock | 202 ++++++++++++++----------- app/assets/javascripts/application.js | 3 +- app/views/layouts/application.html.erb | 4 +- db/schema.rb | 7 +- 5 files changed, 126 insertions(+), 99 deletions(-) diff --git a/Gemfile b/Gemfile index 296ba2e..cd61f8e 100644 --- a/Gemfile +++ b/Gemfile @@ -4,11 +4,11 @@ source 'https://rubygems.org' git_source(:github) { |repo| "https://github.com/#{repo}.git" } # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'rails', '~> 7.0' +gem 'rails', '~> 7.1.0' # Use postgres as the database for Active Record gem 'pg' # Use Puma as the app server -gem 'puma', '~> 5.6' +gem 'puma' # Use SCSS for stylesheets gem 'sass-rails' @@ -18,8 +18,7 @@ gem 'terser' # Use CoffeeScript for .coffee assets and views gem 'coffee-rails', '~> 4.2' -# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks -gem 'turbolinks', '~> 5' + # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder gem 'jbuilder' # Use Redis adapter to run Action Cable in production @@ -47,7 +46,7 @@ end group :development do gem 'capistrano-passenger' # Access an interactive console on exception pages or by calling 'console' anywhere in the code. - gem 'listen', '>= 3.0.5', '< 3.2' + gem 'listen' gem 'web-console' # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring gem 'rubocop' diff --git a/Gemfile.lock b/Gemfile.lock index 89c03f3..a079675 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,76 +1,87 @@ GEM remote: https://rubygems.org/ specs: - actioncable (7.0.8.4) - actionpack (= 7.0.8.4) - activesupport (= 7.0.8.4) + actioncable (7.1.4) + actionpack (= 7.1.4) + activesupport (= 7.1.4) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (7.0.8.4) - actionpack (= 7.0.8.4) - activejob (= 7.0.8.4) - activerecord (= 7.0.8.4) - activestorage (= 7.0.8.4) - activesupport (= 7.0.8.4) + zeitwerk (~> 2.6) + actionmailbox (7.1.4) + actionpack (= 7.1.4) + activejob (= 7.1.4) + activerecord (= 7.1.4) + activestorage (= 7.1.4) + activesupport (= 7.1.4) mail (>= 2.7.1) net-imap net-pop net-smtp - actionmailer (7.0.8.4) - actionpack (= 7.0.8.4) - actionview (= 7.0.8.4) - activejob (= 7.0.8.4) - activesupport (= 7.0.8.4) + actionmailer (7.1.4) + actionpack (= 7.1.4) + actionview (= 7.1.4) + activejob (= 7.1.4) + activesupport (= 7.1.4) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp - rails-dom-testing (~> 2.0) - actionpack (7.0.8.4) - actionview (= 7.0.8.4) - activesupport (= 7.0.8.4) - rack (~> 2.0, >= 2.2.4) + rails-dom-testing (~> 2.2) + actionpack (7.1.4) + actionview (= 7.1.4) + activesupport (= 7.1.4) + 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.4) - actionpack (= 7.0.8.4) - activerecord (= 7.0.8.4) - activestorage (= 7.0.8.4) - activesupport (= 7.0.8.4) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + actiontext (7.1.4) + actionpack (= 7.1.4) + activerecord (= 7.1.4) + activestorage (= 7.1.4) + activesupport (= 7.1.4) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.0.8.4) - activesupport (= 7.0.8.4) + actionview (7.1.4) + activesupport (= 7.1.4) builder (~> 3.1) - erubi (~> 1.4) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (7.0.8.4) - activesupport (= 7.0.8.4) + erubi (~> 1.11) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + activejob (7.1.4) + activesupport (= 7.1.4) globalid (>= 0.3.6) - activemodel (7.0.8.4) - activesupport (= 7.0.8.4) - activerecord (7.0.8.4) - activemodel (= 7.0.8.4) - activesupport (= 7.0.8.4) - activestorage (7.0.8.4) - actionpack (= 7.0.8.4) - activejob (= 7.0.8.4) - activerecord (= 7.0.8.4) - activesupport (= 7.0.8.4) + activemodel (7.1.4) + activesupport (= 7.1.4) + activerecord (7.1.4) + activemodel (= 7.1.4) + activesupport (= 7.1.4) + timeout (>= 0.4.0) + activestorage (7.1.4) + actionpack (= 7.1.4) + activejob (= 7.1.4) + activerecord (= 7.1.4) + activesupport (= 7.1.4) marcel (~> 1.0) - mini_mime (>= 1.1.0) - activesupport (7.0.8.4) + activesupport (7.1.4) + 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.1) public_suffix (>= 2.0.2, < 6.0) airbrussh (1.4.1) sshkit (>= 1.6.1, != 1.7.0) ast (2.4.2) + base64 (0.2.0) + bigdecimal (3.1.8) bindex (0.8.1) bootsnap (1.16.0) msgpack (~> 1.2) @@ -106,23 +117,31 @@ GEM execjs coffee-script-source (1.12.2) concurrent-ruby (1.3.4) + connection_pool (2.4.1) crass (1.0.6) date (3.3.4) diff-lcs (1.5.0) + drb (2.2.1) erubi (1.13.0) execjs (2.8.1) - ffi (1.15.5) + ffi (1.17.0-arm64-darwin) + ffi (1.17.0-x86_64-darwin) + ffi (1.17.0-x86_64-linux-gnu) globalid (1.2.1) activesupport (>= 6.1) - i18n (1.14.5) + i18n (1.14.6) concurrent-ruby (~> 1.0) + io-console (0.7.2) + irb (1.14.0) + rdoc (>= 4.0.0) + reline (>= 0.4.2) jbuilder (2.11.5) actionview (>= 5.0.0) activesupport (>= 5.0.0) json (2.6.3) - listen (3.0.8) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) + listen (3.9.0) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) loofah (2.22.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) @@ -133,11 +152,11 @@ GEM net-smtp marcel (1.0.4) matrix (0.4.2) - method_source (1.0.0) mini_mime (1.1.5) minitest (5.25.1) msgpack (1.6.1) - net-imap (0.4.10) + mutex_m (0.2.0) + net-imap (0.4.16) date net-protocol net-pop (0.1.2) @@ -146,7 +165,7 @@ GEM timeout net-scp (4.0.0) net-ssh (>= 2.6.5, < 8.0.0) - net-smtp (0.4.0.1) + net-smtp (0.5.0) net-protocol net-ssh (7.1.0) nio4r (2.7.3) @@ -161,27 +180,34 @@ GEM parser (3.2.1.1) ast (~> 2.4.1) pg (1.4.6) + psych (5.1.2) + stringio public_suffix (5.0.1) - puma (5.6.9) + puma (6.4.3) nio4r (~> 2.0) racc (1.8.1) - rack (2.2.9) + rack (3.1.7) + rack-session (2.0.0) + rack (>= 3.0.0) rack-test (2.1.0) rack (>= 1.3) - rails (7.0.8.4) - actioncable (= 7.0.8.4) - actionmailbox (= 7.0.8.4) - actionmailer (= 7.0.8.4) - actionpack (= 7.0.8.4) - actiontext (= 7.0.8.4) - actionview (= 7.0.8.4) - activejob (= 7.0.8.4) - activemodel (= 7.0.8.4) - activerecord (= 7.0.8.4) - activestorage (= 7.0.8.4) - activesupport (= 7.0.8.4) + rackup (2.1.0) + rack (>= 3) + webrick (~> 1.8) + rails (7.1.4) + actioncable (= 7.1.4) + actionmailbox (= 7.1.4) + actionmailer (= 7.1.4) + actionpack (= 7.1.4) + actiontext (= 7.1.4) + actionview (= 7.1.4) + activejob (= 7.1.4) + activemodel (= 7.1.4) + activerecord (= 7.1.4) + activestorage (= 7.1.4) + activesupport (= 7.1.4) bundler (>= 1.15.0) - railties (= 7.0.8.4) + railties (= 7.1.4) rails-dom-testing (2.2.0) activesupport (>= 5.0.0) minitest @@ -189,19 +215,24 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - railties (7.0.8.4) - actionpack (= 7.0.8.4) - activesupport (= 7.0.8.4) - method_source + railties (7.1.4) + actionpack (= 7.1.4) + activesupport (= 7.1.4) + 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) + rake (13.2.1) rb-fsevent (0.11.2) - rb-inotify (0.10.1) + rb-inotify (0.11.1) ffi (~> 1.0) + rdoc (6.7.0) + psych (>= 4.0.0) regexp_parser (2.7.0) + reline (0.5.10) + io-console (~> 0.5) rexml (3.3.6) strscan rspec-core (3.12.1) @@ -265,15 +296,13 @@ GEM sshkit (1.21.4) net-scp (>= 1.1.2) net-ssh (>= 2.8.0) + stringio (3.1.1) strscan (3.1.0) terser (1.1.14) execjs (>= 0.3.0, < 3) - thor (1.3.1) + thor (1.3.2) tilt (2.1.0) timeout (0.4.1) - turbolinks (5.2.1) - turbolinks-source (~> 5.2) - turbolinks-source (5.2.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) unicode-display_width (2.4.2) @@ -282,18 +311,20 @@ GEM activemodel (>= 6.0.0) bindex (>= 0.4.0) railties (>= 6.0.0) + webrick (1.8.2) websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.6.13) + zeitwerk (2.6.18) PLATFORMS arm64-darwin-21 arm64-darwin-22 x86_64-darwin-18 x86_64-darwin-19 + x86_64-darwin-21 x86_64-darwin-22 x86_64-linux @@ -306,11 +337,11 @@ DEPENDENCIES capybara coffee-rails (~> 4.2) jbuilder - listen (>= 3.0.5, < 3.2) + listen pagy (~> 3.5) pg - puma (~> 5.6) - rails (~> 7.0) + puma + rails (~> 7.1.0) rspec-rails rspec_junit_formatter rubocop @@ -318,9 +349,8 @@ DEPENDENCIES rubocop-rspec sass-rails terser - turbolinks (~> 5) tzinfo-data web-console BUNDLED WITH - 2.4.19 + 2.4.5 diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 82e6f0f..ba81c9e 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -11,6 +11,5 @@ // about supported directives. // //= require rails-ujs -//= require activestorage -//= require turbolinks +//= require activestorage //= require_tree . diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index cda9278..f7dacfe 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -5,8 +5,8 @@ <%= csrf_meta_tags %> <%= csp_meta_tag %> - <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> - <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> + <%= stylesheet_link_tag 'application', media: 'all' %> + <%= javascript_include_tag 'application' %> diff --git a/db/schema.rb b/db/schema.rb index 55844fb..52d02b6 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,8 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2022_05_25_193602) do - +ActiveRecord::Schema[7.1].define(version: 2022_05_25_193602) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -24,8 +23,8 @@ t.string "location" t.string "copy" t.string "status" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", precision: nil, null: false + t.datetime "updated_at", precision: nil, null: false end end