diff --git a/.ruby-version b/.ruby-version index 23887f6eba..e650c01d92 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.1.7 +3.2.9 diff --git a/Dockerfile b/Dockerfile index 3927d49b13..2b4c6a94fa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:3.1.7-alpine3.19 AS base +FROM ruby:3.2.9-alpine3.19 AS base ENV LANG=C.UTF-8 \ LC_ALL=C.UTF-8 \ TZ=Europe/London \ diff --git a/Gemfile b/Gemfile index 9e1c9a3a61..9890562f9a 100644 --- a/Gemfile +++ b/Gemfile @@ -43,7 +43,7 @@ gem 'web', path: './engines/web' gem "activerecord-postgresql-adapter" gem "arel-helpers", "~> 2.12" -gem "pg", "~> 1.2.3" +gem "pg", "~> 1.2" gem 'acts_as_list', '1.0.4' gem 'cancancan', '~> 1.15.0' diff --git a/Gemfile.lock b/Gemfile.lock index eb7ad59238..b693529828 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -557,7 +557,7 @@ GEM hashery (~> 2.0) ruby-rc4 ttfunk - pg (1.2.3) + pg (1.6.2) pp (0.6.2) prettyprint prettyprint (0.2.0) @@ -1023,7 +1023,7 @@ DEPENDENCIES paranoia (~> 2.4) paypal-sdk-merchant (= 1.117.2) pdf-reader - pg (~> 1.2.3) + pg (~> 1.2) private_address_check pry (~> 0.13.0) puffing-billy @@ -1087,7 +1087,7 @@ DEPENDENCIES wkhtmltopdf-binary RUBY VERSION - ruby 3.1.7p261 + ruby 3.2.9p265 BUNDLED WITH 2.4.3 diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 47e89122ba..343f94332c 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -52,9 +52,9 @@ module ApplicationHelper # Pass URL helper calls on to spree where applicable so that we don't need to use # spree.foo_path in any view rendered from non-spree-namespaced controllers. - def method_missing(method, *args, &) + def method_missing(method, *, &) if method.to_s.end_with?('_path', '_url') && spree.respond_to?(method) - spree.public_send(method, *args) + spree.public_send(method, *) else super end diff --git a/app/models/application_record.rb b/app/models/application_record.rb index a67f8e666f..daccc28cf0 100644 --- a/app/models/application_record.rb +++ b/app/models/application_record.rb @@ -29,7 +29,7 @@ class ApplicationRecord < ActiveRecord::Base end end - def url_for(*args) - Rails.application.routes.url_helpers.url_for(*args) + def url_for(*) + Rails.application.routes.url_helpers.url_for(*) end end diff --git a/app/models/spree/gateway.rb b/app/models/spree/gateway.rb index 0a20269050..3cdcbc7b05 100644 --- a/app/models/spree/gateway.rb +++ b/app/models/spree/gateway.rb @@ -34,11 +34,11 @@ module Spree @provider.respond_to?(method_name, include_private) || super end - def method_missing(method, *args) + def method_missing(method, *) if @provider.nil? || !@provider.respond_to?(method) super else - provider.__send__(method, *args) + provider.__send__(method, *) end end diff --git a/app/models/spree/user.rb b/app/models/spree/user.rb index 94ad89ab15..b32293dbf8 100644 --- a/app/models/spree/user.rb +++ b/app/models/spree/user.rb @@ -56,8 +56,8 @@ module Spree # Send devise-based user emails asyncronously via ActiveJob # See: https://github.com/heartcombo/devise/tree/v3.5.10#activejob-integration - def send_devise_notification(notification, *args) - devise_mailer.public_send(notification, self, *args).deliver_later + def send_devise_notification(notification, *) + devise_mailer.public_send(notification, self, *).deliver_later end def regenerate_reset_password_token diff --git a/spec/system/support/cuprite_helpers.rb b/spec/system/support/cuprite_helpers.rb index 6ca079c6a5..a3dc0c8ef1 100644 --- a/spec/system/support/cuprite_helpers.rb +++ b/spec/system/support/cuprite_helpers.rb @@ -9,8 +9,8 @@ module CupriteHelpers end # Drop #debug anywhere in a test to open a Chrome inspector and pause the execution - def debug(*args) - page.driver.debug(*args) + def debug(*) + page.driver.debug(*) end # Use our `Capybara.save_path` to store screenshots with other capybara artifacts