diff --git a/.ruby-version b/.ruby-version index 818bd47ab..be94e6f53 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.0.6 +3.2.2 diff --git a/Dockerfile b/Dockerfile index 1b91ca41f..08534fcb2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:3.0.6-slim +FROM ruby:3.2-slim # Install dependencies RUN \ diff --git a/Gemfile b/Gemfile index eaace8824..1706b34ac 100644 --- a/Gemfile +++ b/Gemfile @@ -8,7 +8,7 @@ group :preload do gem 'rails', '~> 6.1.7.6' gem 'dotenv' gem 'connection_pool' - gem 'marco-polo' + gem 'marco-polo' # TODO: https://github.com/arches/marco-polo/pull/16 # AR extensions gem 'goldiloader' @@ -55,6 +55,7 @@ gem 'validates_lengths_from_database' gem 'large_object_store' gem 'parallel' gem 'stackprof' +gem 'net-smtp' # treat included plugins like gems Dir[File.join(Bundler.root, 'plugins/*/')].each { |f| gemspec path: f } diff --git a/Gemfile.lock b/Gemfile.lock index 1d15f8f72..43e07c0e3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -438,13 +438,13 @@ GEM railties (>= 6) maxitest (3.7.0) minitest (>= 5.0.0, < 5.15.0) - method_source (0.9.2) + method_source (1.0.0) mime-types (3.5.2) mime-types-data (~> 3.2015) mime-types-data (3.2024.0206) mini_mime (1.1.5) mini_portile2 (2.8.5) - minitest (5.11.3) + minitest (5.14.4) minitest-rails (6.1.1) minitest (~> 5.10) railties (~> 6.1.0) @@ -461,6 +461,10 @@ GEM net-http-persistent (4.0.2) connection_pool (~> 2.2) net-ldap (0.19.0) + net-protocol (0.2.2) + timeout + net-smtp (0.4.0.1) + net-protocol netrc (0.11.0) newrelic_rpm (6.15.0) nio4r (2.7.0) @@ -514,9 +518,9 @@ GEM racc path_expander (1.1.1) pg (1.5.4) - pry (0.12.2) - coderay (~> 1.1.0) - method_source (~> 0.9.0) + pry (0.14.2) + coderay (~> 1.1) + method_source (~> 1.0) pry-byebug (3.3.0) byebug (~> 8.0) pry (~> 0.10) @@ -658,6 +662,7 @@ GEM unicode-display_width (~> 1.1, >= 1.1.1) thor (1.3.0) tilt (2.3.0) + timeout (0.4.1) tzinfo (2.0.6) concurrent-ruby (~> 1.0) uglifier (3.2.0) @@ -731,6 +736,7 @@ DEPENDENCIES momentjs-rails mysql2 net-http-persistent + net-smtp oauth2 (~> 2.0.9) octokit omniauth (~> 2.0) @@ -805,7 +811,7 @@ DEPENDENCIES webmock RUBY VERSION - ruby 3.0.6p216 + ruby 3.2.2p53 BUNDLED WITH 2.4.22 diff --git a/config/application.rb b/config/application.rb index 2ede208df..f15c3a197 100644 --- a/config/application.rb +++ b/config/application.rb @@ -188,7 +188,7 @@ def self.deprecated_url(var) RestartSignalHandler.after_restart RestartSignalHandler.listen end - Samson::BootCheck.check if Rails.env.development? + # Samson::BootCheck.check if Rails.env.development? # TODO: re-enable end unless ENV['PRECOMPILE']