Upgrade to Rails 6.1.7.4

This one was pretty straightforward yaay! Main thing was the change from `render file` to `render template` in a couple places, oh and a thing with complex `order()` clauses.

Gemfile

@@ -1,7 +1,7 @@
 source 'http://rubygems.org'
 ruby '2.6.10'
 
-gem 'rails', '= 6.0.6.1'
+gem 'rails', '= 6.1.7.4'
 
 # Our database is MySQL, in both development and production.
 gem 'mysql2', '~> 0.5.5'

Gemfile.lock

@@ -7,61 +7,65 @@ GIT
 GEM
   remote: http://rubygems.org/
   specs:
-    actioncable (6.0.6.1)
+    actioncable (6.1.7.4)
-      actionpack (= 6.0.6.1)
+      actionpack (= 6.1.7.4)
+      activesupport (= 6.1.7.4)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.0.6.1)
+    actionmailbox (6.1.7.4)
-      actionpack (= 6.0.6.1)
+      actionpack (= 6.1.7.4)
-      activejob (= 6.0.6.1)
+      activejob (= 6.1.7.4)
-      activerecord (= 6.0.6.1)
+      activerecord (= 6.1.7.4)
-      activestorage (= 6.0.6.1)
+      activestorage (= 6.1.7.4)
-      activesupport (= 6.0.6.1)
+      activesupport (= 6.1.7.4)
       mail (>= 2.7.1)
-    actionmailer (6.0.6.1)
+    actionmailer (6.1.7.4)
-      actionpack (= 6.0.6.1)
+      actionpack (= 6.1.7.4)
-      actionview (= 6.0.6.1)
+      actionview (= 6.1.7.4)
-      activejob (= 6.0.6.1)
+      activejob (= 6.1.7.4)
+      activesupport (= 6.1.7.4)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.0.6.1)
+    actionpack (6.1.7.4)
-      actionview (= 6.0.6.1)
+      actionview (= 6.1.7.4)
-      activesupport (= 6.0.6.1)
+      activesupport (= 6.1.7.4)
-      rack (~> 2.0, >= 2.0.8)
+      rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.0.6.1)
+    actiontext (6.1.7.4)
-      actionpack (= 6.0.6.1)
+      actionpack (= 6.1.7.4)
-      activerecord (= 6.0.6.1)
+      activerecord (= 6.1.7.4)
-      activestorage (= 6.0.6.1)
+      activestorage (= 6.1.7.4)
-      activesupport (= 6.0.6.1)
+      activesupport (= 6.1.7.4)
       nokogiri (>= 1.8.5)
-    actionview (6.0.6.1)
+    actionview (6.1.7.4)
-      activesupport (= 6.0.6.1)
+      activesupport (= 6.1.7.4)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.0.6.1)
+    activejob (6.1.7.4)
-      activesupport (= 6.0.6.1)
+      activesupport (= 6.1.7.4)
       globalid (>= 0.3.6)
-    activemodel (6.0.6.1)
+    activemodel (6.1.7.4)
-      activesupport (= 6.0.6.1)
+      activesupport (= 6.1.7.4)
-    activerecord (6.0.6.1)
+    activerecord (6.1.7.4)
-      activemodel (= 6.0.6.1)
+      activemodel (= 6.1.7.4)
-      activesupport (= 6.0.6.1)
+      activesupport (= 6.1.7.4)
-    activestorage (6.0.6.1)
+    activestorage (6.1.7.4)
-      actionpack (= 6.0.6.1)
+      actionpack (= 6.1.7.4)
-      activejob (= 6.0.6.1)
+      activejob (= 6.1.7.4)
-      activerecord (= 6.0.6.1)
+      activerecord (= 6.1.7.4)
+      activesupport (= 6.1.7.4)
       marcel (~> 1.0)
-    activesupport (6.0.6.1)
+      mini_mime (>= 1.1.0)
+    activesupport (6.1.7.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
+      i18n (>= 1.6, < 2)
-      minitest (~> 5.1)
+      minitest (>= 5.1)
-      tzinfo (~> 1.1)
+      tzinfo (~> 2.0)
-      zeitwerk (~> 2.2, >= 2.2.2)
+      zeitwerk (~> 2.3)
     addressable (2.8.4)
       public_suffix (>= 2.0.2, < 6.0)
     babel-source (5.8.35)
@@ -194,20 +198,20 @@ GEM
       rack (>= 1.0, < 4)
     rack-test (2.1.0)
       rack (>= 1.3)
-    rails (6.0.6.1)
+    rails (6.1.7.4)
-      actioncable (= 6.0.6.1)
+      actioncable (= 6.1.7.4)
-      actionmailbox (= 6.0.6.1)
+      actionmailbox (= 6.1.7.4)
-      actionmailer (= 6.0.6.1)
+      actionmailer (= 6.1.7.4)
-      actionpack (= 6.0.6.1)
+      actionpack (= 6.1.7.4)
-      actiontext (= 6.0.6.1)
+      actiontext (= 6.1.7.4)
-      actionview (= 6.0.6.1)
+      actionview (= 6.1.7.4)
-      activejob (= 6.0.6.1)
+      activejob (= 6.1.7.4)
-      activemodel (= 6.0.6.1)
+      activemodel (= 6.1.7.4)
-      activerecord (= 6.0.6.1)
+      activerecord (= 6.1.7.4)
-      activestorage (= 6.0.6.1)
+      activestorage (= 6.1.7.4)
-      activesupport (= 6.0.6.1)
+      activesupport (= 6.1.7.4)
-      bundler (>= 1.3.0)
+      bundler (>= 1.15.0)
-      railties (= 6.0.6.1)
+      railties (= 6.1.7.4)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.1.1)
       activesupport (>= 5.0.0)
@@ -218,12 +222,12 @@ GEM
     rails-i18n (7.0.7)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 8)
-    railties (6.0.6.1)
+    railties (6.1.7.4)
-      actionpack (= 6.0.6.1)
+      actionpack (= 6.1.7.4)
-      activesupport (= 6.0.6.1)
+      activesupport (= 6.1.7.4)
       method_source
-      rake (>= 0.8.7)
+      rake (>= 12.2)
-      thor (>= 0.20.3, < 2.0)
+      thor (~> 1.0)
     rake (13.0.6)
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
@@ -281,11 +285,10 @@ GEM
       sprockets (>= 3.0.0)
     temple (0.8.2)
     thor (1.2.2)
-    thread_safe (0.3.6)
     tilt (2.2.0)
     timeout (0.4.0)
-    tzinfo (1.2.11)
+    tzinfo (2.0.6)
-      thread_safe (~> 0.1)
+      concurrent-ruby (~> 1.0)
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
     unf (0.1.4)
@@ -326,7 +329,7 @@ DEPENDENCIES
   openneo-auth-signatory (~> 0.1.0)
   parallel (~> 1.23)
   rack-attack (~> 6.7)
-  rails (= 6.0.6.1)
+  rails (= 6.1.7.4)
   rails-i18n (~> 7.0, >= 7.0.7)
   rdiscount (~> 2.2, >= 2.2.7.1)
   react-rails (~> 2.7, >= 2.7.1)

app/controllers/application_controller.rb

@@ -49,7 +49,7 @@ class ApplicationController < ActionController::Base
   rescue_from AccessDenied, :with => :on_access_denied
 
   def on_access_denied
-    render :file => 'public/403.html', :layout => false, :status => :forbidden
+    render template: 'public/403.html', :layout => false, :status => :forbidden
   end
 
   def redirect_back!(default=:back)

app/views/layouts/items.html.haml

@@ -11,5 +11,5 @@
     = text_field_tag :q, @query.to_s
     = submit_tag t('.search'), :name => nil
   = yield
-= render :file => 'layouts/application'
+= render template: 'layouts/application'
 

bin/rails

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

bin/rake

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
-require_relative '../config/boot'
+require_relative "../config/boot"
-require 'rake'
+require "rake"
 Rake.application.run

bin/setup

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-require 'fileutils'
+require "fileutils"
 
 # path to your application root.
 APP_ROOT = File.expand_path('..', __dir__)
@@ -18,7 +18,7 @@ FileUtils.chdir APP_ROOT do
   system('bundle check') || system!('bundle install')
 
   # Install JavaScript dependencies
-  # system('bin/yarn')
+  system! 'bin/yarn'
 
   # puts "\n== Copying sample files =="
   # unless File.exist?('config/database.yml')

bin/yarn

@@ -1,9 +1,15 @@
 #!/usr/bin/env ruby
 APP_ROOT = File.expand_path('..', __dir__)
 Dir.chdir(APP_ROOT) do
-  begin
+  yarn = ENV["PATH"].split(File::PATH_SEPARATOR).
-    exec "yarnpkg", *ARGV
+    select { |dir| File.expand_path(dir) != __dir__ }.
-  rescue Errno::ENOENT
+    product(["yarn", "yarn.cmd", "yarn.ps1"]).
+    map { |dir, file| File.expand_path(file, dir) }.
+    find { |file| File.executable?(file) }
+
+  if yarn
+    exec yarn, *ARGV
+  else
     $stderr.puts "Yarn executable was not detected in the system."
     $stderr.puts "Download Yarn at https://yarnpkg.com/en/docs/install"
     exit 1

config.ru

@@ -1,6 +1,6 @@
 # This file is used by Rack-based servers to start the application.
 
-require ::File.expand_path('../config/environment',  __FILE__)
+require_relative "config/environment"
 
-use Rack::FiberPool if defined?(USE_FIBER_POOL) && USE_FIBER_POOL
+run Rails.application
-run OpenneoImpressItems::Application
+Rails.application.load_server

config/application.rb

@@ -1,6 +1,6 @@
-require_relative 'boot'
+require_relative "boot"
 
-require 'rails/all'
+require "rails/all"
 
 # Require the gems listed in Gemfile, including any gems
 # you've limited to :test, :development, or :production.
@@ -9,7 +9,7 @@ Bundler.require(*Rails.groups)
 module OpenneoImpressItems
   class Application < Rails::Application
     # Initialize configuration defaults for originally generated Rails version.
-    config.load_defaults 6.0
+    config.load_defaults 6.1
 
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration should go into files in config/initializers

config/boot.rb

@@ -1,4 +1,4 @@
 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.

config/environment.rb

@@ -1,5 +1,5 @@
 # Load the Rails application.
-require_relative 'application'
+require_relative "application"
 
 # Initialize the Rails application.
 Rails.application.initialize!

config/environments/development.rb

@@ -1,3 +1,5 @@
+require "active_support/core_ext/integer/time"
+
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 

config/environments/production.rb

@@ -1,3 +1,5 @@
+require "active_support/core_ext/integer/time"
+
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 

config/environments/test.rb

@@ -1,3 +1,5 @@
+require "active_support/core_ext/integer/time"
+
 # The test environment is used exclusively to run your application's
 # test suite. You never need to work with it otherwise. Remember that
 # your test database is "scratch space" for the test suite and is wiped
@@ -43,6 +45,15 @@ Rails.application.configure do
   # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr
 
+  # Raise exceptions for disallowed deprecations.
+  config.active_support.disallowed_deprecation = :raise
+
+  # Tell Active Support which deprecation messages to disallow.
+  config.active_support.disallowed_deprecation_warnings = []
+
   # Raises error for missing translations.
-  # config.action_view.raise_on_missing_translations = true
+  # config.i18n.raise_on_missing_translations = true
+
+  # Annotate rendered view with file names.
+  # config.action_view.annotate_rendered_view_with_filenames = true
 end

config/initializers/backtrace_silencers.rb

@@ -1,7 +1,8 @@
 # Be sure to restart your server when you modify this file.
 
 # You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.
-# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ }
+# Rails.backtrace_cleaner.add_silencer { |line| /my_noisy_library/.match?(line) }
 
-# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code.
+# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code
-# Rails.backtrace_cleaner.remove_silencers!
+# by setting BACKTRACE=1 before calling your invocation, like "BACKTRACE=1 ./bin/rails runner 'MyClass.perform'".
+Rails.backtrace_cleaner.remove_silencers! if ENV["BACKTRACE"]

config/initializers/filter_parameter_logging.rb

@@ -1,4 +1,6 @@
 # Be sure to restart your server when you modify this file.
 
 # Configure sensitive parameters which will be filtered from the log file.
-Rails.application.config.filter_parameters += [:password]
+Rails.application.config.filter_parameters += [
+  :passw, :secret, :token, :_key, :crypt, :salt, :certificate, :otp, :ssn
+]

config/initializers/permissions_policy.rb

@@ -0,0 +1,11 @@
+# Define an application-wide HTTP permissions policy. For further
+# information see https://developers.google.com/web/updates/2018/06/feature-policy
+#
+# Rails.application.config.permissions_policy do |f|
+#   f.camera      :none
+#   f.gyroscope   :none
+#   f.microphone  :none
+#   f.usb         :none
+#   f.fullscreen  :self
+#   f.payment     :self, "https://secure.example.com"
+# end