Upgrade to Rails 7.0.6

Whew! Seems like a pretty clean one? Ran `rails app:upgrade` and stuff, and made some corrections to keyword arguments for `translate` calls. There might be more such problems elsewhere? But that's hard to search for, and we'll have to see.
This commit is contained in:
Emi Matchu 2023-08-03 16:37:45 -07:00
parent 42e6e4fdf2
commit 8f4200d0d3
49 changed files with 134 additions and 133 deletions

View file

@ -1,7 +1,7 @@
source 'http://rubygems.org' source 'http://rubygems.org'
ruby '3.0.6' ruby '3.0.6'
gem 'rails', '= 6.1.7.4' gem 'rails', '= 7.0.6'
# The HTTP server running the Rails instance. # The HTTP server running the Rails instance.
gem 'webrick', '~> 1.7' gem 'webrick', '~> 1.7'

View file

@ -7,65 +7,71 @@ GIT
GEM GEM
remote: http://rubygems.org/ remote: http://rubygems.org/
specs: specs:
actioncable (6.1.7.4) actioncable (7.0.6)
actionpack (= 6.1.7.4) actionpack (= 7.0.6)
activesupport (= 6.1.7.4) activesupport (= 7.0.6)
nio4r (~> 2.0) nio4r (~> 2.0)
websocket-driver (>= 0.6.1) websocket-driver (>= 0.6.1)
actionmailbox (6.1.7.4) actionmailbox (7.0.6)
actionpack (= 6.1.7.4) actionpack (= 7.0.6)
activejob (= 6.1.7.4) activejob (= 7.0.6)
activerecord (= 6.1.7.4) activerecord (= 7.0.6)
activestorage (= 6.1.7.4) activestorage (= 7.0.6)
activesupport (= 6.1.7.4) activesupport (= 7.0.6)
mail (>= 2.7.1) mail (>= 2.7.1)
actionmailer (6.1.7.4) net-imap
actionpack (= 6.1.7.4) net-pop
actionview (= 6.1.7.4) net-smtp
activejob (= 6.1.7.4) actionmailer (7.0.6)
activesupport (= 6.1.7.4) actionpack (= 7.0.6)
actionview (= 7.0.6)
activejob (= 7.0.6)
activesupport (= 7.0.6)
mail (~> 2.5, >= 2.5.4) mail (~> 2.5, >= 2.5.4)
net-imap
net-pop
net-smtp
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
actionpack (6.1.7.4) actionpack (7.0.6)
actionview (= 6.1.7.4) actionview (= 7.0.6)
activesupport (= 6.1.7.4) activesupport (= 7.0.6)
rack (~> 2.0, >= 2.0.9) rack (~> 2.0, >= 2.2.4)
rack-test (>= 0.6.3) rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (6.1.7.4) actiontext (7.0.6)
actionpack (= 6.1.7.4) actionpack (= 7.0.6)
activerecord (= 6.1.7.4) activerecord (= 7.0.6)
activestorage (= 6.1.7.4) activestorage (= 7.0.6)
activesupport (= 6.1.7.4) activesupport (= 7.0.6)
globalid (>= 0.6.0)
nokogiri (>= 1.8.5) nokogiri (>= 1.8.5)
actionview (6.1.7.4) actionview (7.0.6)
activesupport (= 6.1.7.4) activesupport (= 7.0.6)
builder (~> 3.1) builder (~> 3.1)
erubi (~> 1.4) erubi (~> 1.4)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0)
activejob (6.1.7.4) activejob (7.0.6)
activesupport (= 6.1.7.4) activesupport (= 7.0.6)
globalid (>= 0.3.6) globalid (>= 0.3.6)
activemodel (6.1.7.4) activemodel (7.0.6)
activesupport (= 6.1.7.4) activesupport (= 7.0.6)
activerecord (6.1.7.4) activerecord (7.0.6)
activemodel (= 6.1.7.4) activemodel (= 7.0.6)
activesupport (= 6.1.7.4) activesupport (= 7.0.6)
activestorage (6.1.7.4) activestorage (7.0.6)
actionpack (= 6.1.7.4) actionpack (= 7.0.6)
activejob (= 6.1.7.4) activejob (= 7.0.6)
activerecord (= 6.1.7.4) activerecord (= 7.0.6)
activesupport (= 6.1.7.4) activesupport (= 7.0.6)
marcel (~> 1.0) marcel (~> 1.0)
mini_mime (>= 1.1.0) mini_mime (>= 1.1.0)
activesupport (6.1.7.4) activesupport (7.0.6)
concurrent-ruby (~> 1.0, >= 1.0.2) concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2) i18n (>= 1.6, < 2)
minitest (>= 5.1) minitest (>= 5.1)
tzinfo (~> 2.0) tzinfo (~> 2.0)
zeitwerk (~> 2.3)
addressable (2.8.4) addressable (2.8.4)
public_suffix (>= 2.0.2, < 6.0) public_suffix (>= 2.0.2, < 6.0)
babel-source (5.8.35) babel-source (5.8.35)
@ -184,8 +190,8 @@ GEM
net-ssh (>= 2.6.5) net-ssh (>= 2.6.5)
netrc (0.11.0) netrc (0.11.0)
nio4r (2.5.9) nio4r (2.5.9)
nokogiri (1.13.10) nokogiri (1.15.3)
mini_portile2 (~> 2.8.0) mini_portile2 (~> 2.8.2)
racc (~> 1.4) racc (~> 1.4)
openneo-auth-signatory (0.1.0) openneo-auth-signatory (0.1.0)
ruby-hmac ruby-hmac
@ -198,36 +204,37 @@ GEM
rack (>= 1.0, < 4) rack (>= 1.0, < 4)
rack-test (2.1.0) rack-test (2.1.0)
rack (>= 1.3) rack (>= 1.3)
rails (6.1.7.4) rails (7.0.6)
actioncable (= 6.1.7.4) actioncable (= 7.0.6)
actionmailbox (= 6.1.7.4) actionmailbox (= 7.0.6)
actionmailer (= 6.1.7.4) actionmailer (= 7.0.6)
actionpack (= 6.1.7.4) actionpack (= 7.0.6)
actiontext (= 6.1.7.4) actiontext (= 7.0.6)
actionview (= 6.1.7.4) actionview (= 7.0.6)
activejob (= 6.1.7.4) activejob (= 7.0.6)
activemodel (= 6.1.7.4) activemodel (= 7.0.6)
activerecord (= 6.1.7.4) activerecord (= 7.0.6)
activestorage (= 6.1.7.4) activestorage (= 7.0.6)
activesupport (= 6.1.7.4) activesupport (= 7.0.6)
bundler (>= 1.15.0) bundler (>= 1.15.0)
railties (= 6.1.7.4) railties (= 7.0.6)
sprockets-rails (>= 2.0.0) rails-dom-testing (2.2.0)
rails-dom-testing (2.1.1)
activesupport (>= 5.0.0) activesupport (>= 5.0.0)
minitest minitest
nokogiri (>= 1.6) nokogiri (>= 1.6)
rails-html-sanitizer (1.5.0) rails-html-sanitizer (1.6.0)
loofah (~> 2.19, >= 2.19.1) loofah (~> 2.21)
nokogiri (~> 1.14)
rails-i18n (7.0.7) rails-i18n (7.0.7)
i18n (>= 0.7, < 2) i18n (>= 0.7, < 2)
railties (>= 6.0.0, < 8) railties (>= 6.0.0, < 8)
railties (6.1.7.4) railties (7.0.6)
actionpack (= 6.1.7.4) actionpack (= 7.0.6)
activesupport (= 6.1.7.4) activesupport (= 7.0.6)
method_source method_source
rake (>= 12.2) rake (>= 12.2)
thor (~> 1.0) thor (~> 1.0)
zeitwerk (~> 2.5)
rake (13.0.6) rake (13.0.6)
rb-fsevent (0.11.2) rb-fsevent (0.11.2)
rb-inotify (0.10.1) rb-inotify (0.10.1)
@ -330,7 +337,7 @@ DEPENDENCIES
openneo-auth-signatory (~> 0.1.0) openneo-auth-signatory (~> 0.1.0)
parallel (~> 1.23) parallel (~> 1.23)
rack-attack (~> 6.7) rack-attack (~> 6.7)
rails (= 6.1.7.4) rails (= 7.0.6)
rails-i18n (~> 7.0, >= 7.0.7) rails-i18n (~> 7.0, >= 7.0.7)
rdiscount (~> 2.2, >= 2.2.7.1) rdiscount (~> 2.2, >= 2.2.7.1)
react-rails (~> 2.7, >= 2.7.1) react-rails (~> 2.7, >= 2.7.1)

View file

@ -199,7 +199,7 @@ module ApplicationHelper
end end
def translate_markdown(key, options={}) def translate_markdown(key, options={})
md translate("#{key}_markdown", options) md translate("#{key}_markdown", **options)
end end
alias_method :tmd, :translate_markdown alias_method :tmd, :translate_markdown
@ -220,12 +220,12 @@ module ApplicationHelper
link_options = {} link_options = {}
link_urls.each do |link_key, url| link_urls.each do |link_key, url|
content = translate("#{key}.#{link_key}_content", nonlink_options) content = translate("#{key}.#{link_key}_content", **nonlink_options)
link_options[link_key.to_sym] = link_to(content, url) link_options[link_key.to_sym] = link_to(content, url)
end end
converted_options = link_options.merge(nonlink_options) converted_options = link_options.merge(nonlink_options)
translate("#{key}.main_html", converted_options) translate("#{key}.main_html", **converted_options)
end end
alias_method :twl, :translate_with_links alias_method :twl, :translate_with_links

View file

@ -11,9 +11,9 @@ module OutfitsHelper
:contributed_description => contributed_description(contributed, false) :contributed_description => contributed_description(contributed, false)
end end
def link_to_edit_outfit(content_or_outfit, outfit_or_options, options={}) def link_to_edit_outfit(content_or_outfit, outfit_or_options, options={}, &block)
if block_given? if block_given?
content = capture_haml(&Proc.new) content = capture_haml(&block)
outfit = content_or_outfit outfit = content_or_outfit
options = outfit_or_options options = outfit_or_options
else else
@ -100,9 +100,9 @@ module OutfitsHelper
:created_at_ago => created_at_ago :created_at_ago => created_at_ago
end end
def outfit_li_for(outfit) def outfit_li_for(outfit, &block)
class_name = outfit.starred? ? 'starred' : nil class_name = outfit.starred? ? 'starred' : nil
content_tag :li, :class => class_name, &Proc.new content_tag :li, :class => class_name, &block
end end
def pet_attribute_select(name, collection, value=nil) def pet_attribute_select(name, collection, value=nil)

View file

@ -27,7 +27,7 @@
= yield :before_title = yield :before_title
- if content_for?(:title) && show_title_header? - if content_for?(:title) && show_title_header?
%h1#title= yield :title %h1#title= yield :title
= render 'static/announcement.html' = render 'static/announcement'
= yield :before_flashes = yield :before_flashes
= flashes = flashes

View file

@ -1,4 +1,4 @@
#!/usr/bin/env ruby #!/usr/bin/env ruby
APP_PATH = File.expand_path('../config/application', __dir__) APP_PATH = File.expand_path("../config/application", __dir__)
require_relative "../config/boot" require_relative "../config/boot"
require "rails/commands" require "rails/commands"

View file

@ -2,7 +2,7 @@
require "fileutils" require "fileutils"
# path to your application root. # path to your application root.
APP_ROOT = File.expand_path('..', __dir__) APP_ROOT = File.expand_path("..", __dir__)
def system!(*args) def system!(*args)
system(*args) || abort("\n== Command #{args} failed ==") system(*args) || abort("\n== Command #{args} failed ==")
@ -13,24 +13,21 @@ FileUtils.chdir APP_ROOT do
# This script is idempotent, so that you can run it at any time and get an expectable outcome. # This script is idempotent, so that you can run it at any time and get an expectable outcome.
# Add necessary setup steps to this file. # Add necessary setup steps to this file.
puts '== Installing dependencies ==' puts "== Installing dependencies =="
system! 'gem install bundler --conservative' system! "gem install bundler --conservative"
system('bundle check') || system!('bundle install') system("bundle check") || system!("bundle install")
# Install JavaScript dependencies
system! 'bin/yarn'
# puts "\n== Copying sample files ==" # puts "\n== Copying sample files =="
# unless File.exist?('config/database.yml') # unless File.exist?("config/database.yml")
# FileUtils.cp 'config/database.yml.sample', 'config/database.yml' # FileUtils.cp "config/database.yml.sample", "config/database.yml"
# end # end
puts "\n== Preparing database ==" puts "\n== Preparing database =="
system! 'bin/rails db:prepare' system! "bin/rails db:prepare"
puts "\n== Removing old logs and tempfiles ==" puts "\n== Removing old logs and tempfiles =="
system! 'bin/rails log:clear tmp:clear' system! "bin/rails log:clear tmp:clear"
puts "\n== Restarting application server ==" puts "\n== Restarting application server =="
system! 'bin/rails restart' system! "bin/rails restart"
end end

View file

@ -9,7 +9,7 @@ Bundler.require(*Rails.groups)
module OpenneoImpressItems module OpenneoImpressItems
class Application < Rails::Application class Application < Rails::Application
# Initialize configuration defaults for originally generated Rails version. # Initialize configuration defaults for originally generated Rails version.
config.load_defaults 6.1 config.load_defaults 7.0
# Settings in config/environments/* take precedence over those specified here. # Settings in config/environments/* take precedence over those specified here.
# Application configuration should go into files in config/initializers # Application configuration should go into files in config/initializers

View file

@ -1,4 +1,4 @@
ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
require "bundler/setup" # Set up gems listed in the Gemfile. require "bundler/setup" # Set up gems listed in the Gemfile.
require "bootsnap/setup" # Speed up boot time by caching expensive operations. require "bootsnap/setup" # Speed up boot time by caching expensive operations.

View file

@ -13,10 +13,13 @@ Rails.application.configure do
# Show full error reports. # Show full error reports.
config.consider_all_requests_local = true config.consider_all_requests_local = true
# Enable server timing
config.server_timing = true
# Enable/disable caching. By default caching is disabled. # Enable/disable caching. By default caching is disabled.
# Run rails dev:cache to toggle caching. # Run rails dev:cache to toggle caching.
if Rails.root.join('tmp', 'caching-dev.txt').exist? if Rails.root.join("tmp/caching-dev.txt").exist?
config.action_controller.perform_caching = true config.action_controller.perform_caching = true
config.action_controller.enable_fragment_cache_logging = true config.action_controller.enable_fragment_cache_logging = true

View file

@ -46,8 +46,6 @@ Rails.application.configure do
# Enable threaded mode # Enable threaded mode
# config.threadsafe! # config.threadsafe!
config.active_support.deprecation = :log
# Disable serving static files from the `/public` folder by default since # Disable serving static files from the `/public` folder by default since
# Apache or NGINX already handles this. # Apache or NGINX already handles this.
@ -71,9 +69,9 @@ Rails.application.configure do
# Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
# config.force_ssl = true # config.force_ssl = true
# Use the lowest log level to ensure availability of diagnostic information # Include generic and useful information about system operation, but avoid logging too much
# when problems arise. # information to avoid inadvertent exposure of personally identifiable information (PII).
config.log_level = :debug config.log_level = :info
# Prepend all log lines with the following tags. # Prepend all log lines with the following tags.
config.log_tags = [ :request_id ] config.log_tags = [ :request_id ]
@ -101,7 +99,7 @@ Rails.application.configure do
config.i18n.fallbacks = true config.i18n.fallbacks = true
# Send deprecation notices to registered listeners. # Send deprecation notices to registered listeners.
config.active_support.deprecation = :notify config.active_support.report_deprecations = false
# Use default logging formatter so that PID and timestamp are not suppressed. # Use default logging formatter so that PID and timestamp are not suppressed.
config.log_formatter = ::Logger::Formatter.new config.log_formatter = ::Logger::Formatter.new

View file

@ -8,17 +8,18 @@ require "active_support/core_ext/integer/time"
Rails.application.configure do Rails.application.configure do
# Settings specified here will take precedence over those in config/application.rb. # Settings specified here will take precedence over those in config/application.rb.
# Turn false under Spring and add config.action_view.cache_template_loading = true.
config.cache_classes = true config.cache_classes = true
# Do not eager load code on boot. This avoids loading your whole application # Eager loading loads your whole application. When running a single test locally,
# just for the purpose of running a single test. If you are using a tool that # this probably isn't necessary. It's a good idea to do in a continuous integration
# preloads Rails for running tests, you may have to set it to true. # system, or in some way before deploying your code.
config.eager_load = false config.eager_load = ENV["CI"].present?
# Configure public file server for tests with Cache-Control for performance. # Configure public file server for tests with Cache-Control for performance.
config.public_file_server.enabled = true config.public_file_server.enabled = true
config.public_file_server.headers = { config.public_file_server.headers = {
'Cache-Control' => "public, max-age=#{1.hour.to_i}" "Cache-Control" => "public, max-age=#{1.hour.to_i}"
} }
# Show full error reports and disable caching. # Show full error reports and disable caching.

View file

@ -1,12 +1,10 @@
# Be sure to restart your server when you modify this file. # Be sure to restart your server when you modify this file.
# Version of your assets, change this if you want to expire all your assets. # Version of your assets, change this if you want to expire all your assets.
Rails.application.config.assets.version = '1.0' Rails.application.config.assets.version = "1.0"
# Add additional assets to the asset load path. # Add additional assets to the asset load path.
# Rails.application.config.assets.paths << Emoji.images_path # Rails.application.config.assets.paths << Emoji.images_path
# Add Yarn node_modules folder to the asset load path.
Rails.application.config.assets.paths << Rails.root.join('node_modules')
# Precompile additional assets. # Precompile additional assets.
# application.js, application.css, and all non-JS/CSS in the app/assets # application.js, application.css, and all non-JS/CSS in the app/assets

View file

@ -1,30 +1,25 @@
# Be sure to restart your server when you modify this file. # Be sure to restart your server when you modify this file.
# Define an application-wide content security policy # Define an application-wide content security policy.
# For further information see the following documentation # See the Securing Rails Applications Guide for more information:
# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy # https://guides.rubyonrails.org/security.html#content-security-policy-header
# Rails.application.config.content_security_policy do |policy| # Rails.application.configure do
# policy.default_src :self, :https # config.content_security_policy do |policy|
# policy.font_src :self, :https, :data # policy.default_src :self, :https
# policy.img_src :self, :https, :data # policy.font_src :self, :https, :data
# policy.object_src :none # policy.img_src :self, :https, :data
# policy.script_src :self, :https # policy.object_src :none
# policy.style_src :self, :https # policy.script_src :self, :https
# # If you are using webpack-dev-server then specify webpack-dev-server host # policy.style_src :self, :https
# policy.connect_src :self, :https, "http://localhost:3035", "ws://localhost:3035" if Rails.env.development? # # Specify URI for violation reports
# # policy.report_uri "/csp-violation-report-endpoint"
# # Specify URI for violation reports # end
# # policy.report_uri "/csp-violation-report-endpoint" #
# # Generate session nonces for permitted importmap and inline scripts
# config.content_security_policy_nonce_generator = ->(request) { request.session.id.to_s }
# config.content_security_policy_nonce_directives = %w(script-src)
#
# # Report violations without enforcing the policy.
# # config.content_security_policy_report_only = true
# end # end
# If you are using UJS then enable automatic nonce generation
# Rails.application.config.content_security_policy_nonce_generator = -> request { SecureRandom.base64(16) }
# Set the nonce only to specific directives
# Rails.application.config.content_security_policy_nonce_directives = %w(script-src)
# Report CSP violations to a specified URI
# For further information see the following documentation:
# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy-Report-Only
# Rails.application.config.content_security_policy_report_only = true

View file

@ -1,6 +1,8 @@
# Be sure to restart your server when you modify this file. # Be sure to restart your server when you modify this file.
# Configure sensitive parameters which will be filtered from the log file. # Configure parameters to be filtered from the log file. Use this to limit dissemination of
# sensitive information. See the ActiveSupport::ParameterFilter documentation for supported
# notations and behaviors.
Rails.application.config.filter_parameters += [ Rails.application.config.filter_parameters += [
:passw, :secret, :token, :_key, :crypt, :salt, :certificate, :otp, :ssn :passw, :secret, :token, :_key, :crypt, :salt, :certificate, :otp, :ssn
] ]

View file

@ -4,13 +4,13 @@
# are locale specific, and you may define rules for as many different # are locale specific, and you may define rules for as many different
# locales as you wish. All of these examples are active by default: # locales as you wish. All of these examples are active by default:
# ActiveSupport::Inflector.inflections(:en) do |inflect| # ActiveSupport::Inflector.inflections(:en) do |inflect|
# inflect.plural /^(ox)$/i, '\1en' # inflect.plural /^(ox)$/i, "\\1en"
# inflect.singular /^(ox)en/i, '\1' # inflect.singular /^(ox)en/i, "\\1"
# inflect.irregular 'person', 'people' # inflect.irregular "person", "people"
# inflect.uncountable %w( fish sheep ) # inflect.uncountable %w( fish sheep )
# end # end
# These inflection rules are supported but not enabled by default: # These inflection rules are supported but not enabled by default:
# ActiveSupport::Inflector.inflections(:en) do |inflect| # ActiveSupport::Inflector.inflections(:en) do |inflect|
# inflect.acronym 'RESTful' # inflect.acronym "RESTful"
# end # end

View file

@ -11,7 +11,7 @@
# #
# It's strongly recommended that you check this file into your version control system. # It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema.define(version: 20230802195548) do ActiveRecord::Schema[6.1].define(version: 20230802195548) do
create_table "auth_servers", force: true do |t| create_table "auth_servers", force: true do |t|
t.string "short_name", limit: 10, null: false t.string "short_name", limit: 10, null: false

Binary file not shown.

BIN
vendor/cache/actioncable-7.0.6.gem vendored Normal file

Binary file not shown.

Binary file not shown.

BIN
vendor/cache/actionmailbox-7.0.6.gem vendored Normal file

Binary file not shown.

Binary file not shown.

BIN
vendor/cache/actionmailer-7.0.6.gem vendored Normal file

Binary file not shown.

Binary file not shown.

BIN
vendor/cache/actionpack-7.0.6.gem vendored Normal file

Binary file not shown.

Binary file not shown.

BIN
vendor/cache/actiontext-7.0.6.gem vendored Normal file

Binary file not shown.

Binary file not shown.

BIN
vendor/cache/actionview-7.0.6.gem vendored Normal file

Binary file not shown.

Binary file not shown.

BIN
vendor/cache/activejob-7.0.6.gem vendored Normal file

Binary file not shown.

Binary file not shown.

BIN
vendor/cache/activemodel-7.0.6.gem vendored Normal file

Binary file not shown.

Binary file not shown.

BIN
vendor/cache/activerecord-7.0.6.gem vendored Normal file

Binary file not shown.

Binary file not shown.

BIN
vendor/cache/activestorage-7.0.6.gem vendored Normal file

Binary file not shown.

Binary file not shown.

BIN
vendor/cache/activesupport-7.0.6.gem vendored Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
vendor/cache/rails-7.0.6.gem vendored Normal file

Binary file not shown.

Binary file not shown.

BIN
vendor/cache/rails-dom-testing-2.2.0.gem vendored Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
vendor/cache/railties-7.0.6.gem vendored Normal file

Binary file not shown.