From 7da7a62c13f626f25031f7d42b5d58d69858fa6e Mon Sep 17 00:00:00 2001 From: Anton-Ivanov Date: Sat, 26 Oct 2024 15:50:07 +0300 Subject: [PATCH] bump Ruby on Rails from v7.0.8.5 to v7.1.0 --- Gemfile | 2 +- Gemfile.lock | 190 +++++++++++++++----------- config/initializers/print_timezone.rb | 8 +- spec/spec_helper.rb | 2 +- 4 files changed, 119 insertions(+), 83 deletions(-) diff --git a/Gemfile b/Gemfile index e0da818bc..2896dd016 100644 --- a/Gemfile +++ b/Gemfile @@ -10,7 +10,7 @@ gem 'pg' gem 'pg_advisory_lock', git: 'https://github.com/didww/pg_advisory_lock.git' gem 'pg_sql_caller', git: 'https://github.com/didww/pg_sql_caller.git' gem 'rack', ' ~> 2.2.6' -gem 'rails', '~> 7.0' +gem 'rails', '~> 7.1.0' gem 'responders' # Authentication diff --git a/Gemfile.lock b/Gemfile.lock index 3d6ac3e9c..f0eaa3258 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -105,51 +105,55 @@ GIT GEM remote: https://rubygems.org/ specs: - actioncable (7.0.8.5) - actionpack (= 7.0.8.5) - activesupport (= 7.0.8.5) + actioncable (7.1.5) + actionpack (= 7.1.5) + activesupport (= 7.1.5) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (7.0.8.5) - actionpack (= 7.0.8.5) - activejob (= 7.0.8.5) - activerecord (= 7.0.8.5) - activestorage (= 7.0.8.5) - activesupport (= 7.0.8.5) + zeitwerk (~> 2.6) + actionmailbox (7.1.5) + actionpack (= 7.1.5) + activejob (= 7.1.5) + activerecord (= 7.1.5) + activestorage (= 7.1.5) + activesupport (= 7.1.5) mail (>= 2.7.1) net-imap net-pop net-smtp - actionmailer (7.0.8.5) - actionpack (= 7.0.8.5) - actionview (= 7.0.8.5) - activejob (= 7.0.8.5) - activesupport (= 7.0.8.5) + actionmailer (7.1.5) + actionpack (= 7.1.5) + actionview (= 7.1.5) + activejob (= 7.1.5) + activesupport (= 7.1.5) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp - rails-dom-testing (~> 2.0) - actionpack (7.0.8.5) - actionview (= 7.0.8.5) - activesupport (= 7.0.8.5) - rack (~> 2.0, >= 2.2.4) + rails-dom-testing (~> 2.2) + actionpack (7.1.5) + actionview (= 7.1.5) + activesupport (= 7.1.5) + 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.5) - actionpack (= 7.0.8.5) - activerecord (= 7.0.8.5) - activestorage (= 7.0.8.5) - activesupport (= 7.0.8.5) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + actiontext (7.1.5) + actionpack (= 7.1.5) + activerecord (= 7.1.5) + activestorage (= 7.1.5) + activesupport (= 7.1.5) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.0.8.5) - activesupport (= 7.0.8.5) + actionview (7.1.5) + activesupport (= 7.1.5) builder (~> 3.1) - erubi (~> 1.4) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.1, >= 1.2.0) + erubi (~> 1.11) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) active_admin_datetimepicker (1.1.0) activeadmin (>= 2.14.0, < 4.0) active_admin_import (5.0.0) @@ -174,8 +178,8 @@ GEM kaminari (>= 1.2.1) railties (>= 6.1) ransack (>= 4.0) - activejob (7.0.8.5) - activesupport (= 7.0.8.5) + activejob (7.1.5) + activesupport (= 7.1.5) globalid (>= 0.3.6) activeldap (5.1.1) activemodel (> 4.0.0) @@ -183,40 +187,51 @@ GEM gettext gettext_i18n_rails locale - activemodel (7.0.8.5) - activesupport (= 7.0.8.5) + activemodel (7.1.5) + activesupport (= 7.1.5) activemodel-serializers-xml (1.0.2) activemodel (> 5.x) activesupport (> 5.x) builder (~> 3.1) - activerecord (7.0.8.5) - activemodel (= 7.0.8.5) - activesupport (= 7.0.8.5) + activerecord (7.1.5) + activemodel (= 7.1.5) + activesupport (= 7.1.5) + timeout (>= 0.4.0) activerecord-import (1.4.1) activerecord (>= 4.2) - activestorage (7.0.8.5) - actionpack (= 7.0.8.5) - activejob (= 7.0.8.5) - activerecord (= 7.0.8.5) - activesupport (= 7.0.8.5) + activestorage (7.1.5) + actionpack (= 7.1.5) + activejob (= 7.1.5) + activerecord (= 7.1.5) + activesupport (= 7.1.5) marcel (~> 1.0) - mini_mime (>= 1.1.0) - activesupport (7.0.8.5) + activesupport (7.1.5) + base64 + benchmark (>= 0.3) + bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) + connection_pool (>= 2.2.5) + drb i18n (>= 1.6, < 2) + logger (>= 1.4.2) minitest (>= 5.1) + mutex_m + securerandom (>= 0.3) tzinfo (~> 2.0) addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) annotate (3.2.0) activerecord (>= 3.2, < 8.0) rake (>= 10.4, < 14.0) - arbre (1.5.0) - activesupport (>= 3.0.0, < 7.1) - ruby2_keywords (>= 0.0.2, < 1.0) + arbre (1.7.0) + activesupport (>= 3.0.0) + ruby2_keywords (>= 0.0.2) ast (2.4.2) awesome_print (1.8.0) + base64 (0.2.0) bcrypt (3.1.13) + benchmark (0.4.0) + bigdecimal (3.1.8) bootsnap (1.9.1) msgpack (~> 1.0) brakeman (6.1.2) @@ -261,6 +276,7 @@ GEM config (3.1.0) deep_merge (~> 1.2, >= 1.2.1) dry-validation (~> 1.0, >= 1.0.0) + connection_pool (2.4.1) crack (0.4.5) rexml crass (1.0.6) @@ -300,6 +316,7 @@ GEM activesupport (>= 5.0) request_store (>= 1.0) ruby2_keywords + drb (2.2.1) dry-configurable (1.0.1) dry-core (~> 1.0, < 2) zeitwerk (~> 2.6) @@ -368,8 +385,8 @@ GEM text (>= 1.3.0) gettext_i18n_rails (1.8.0) fast_gettext (>= 0.9.0) - globalid (1.1.0) - activesupport (>= 5.0) + globalid (1.2.1) + activesupport (>= 6.1) google-protobuf (3.25.5) googleapis-common-protos-types (1.11.0) google-protobuf (~> 3.18) @@ -382,11 +399,15 @@ GEM multi_xml (>= 0.5.2) i18n (1.14.6) concurrent-ruby (~> 1.0) - inherited_resources (1.13.1) - actionpack (>= 5.2, < 7.1) - has_scope (~> 0.6) - railties (>= 5.2, < 7.1) - responders (>= 2, < 4) + inherited_resources (1.14.0) + actionpack (>= 6.0) + has_scope (>= 0.6) + railties (>= 6.0) + responders (>= 2) + io-console (0.7.2) + irb (1.14.1) + rdoc (>= 4.0.0) + reline (>= 0.4.2) jquery-rails (4.4.0) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) @@ -418,6 +439,7 @@ GEM rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) locale (2.1.2) + logger (1.6.1) loofah (2.22.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) @@ -426,9 +448,8 @@ GEM net-imap net-pop net-smtp - marcel (1.0.2) + marcel (1.0.4) matrix (0.4.2) - method_source (1.0.0) mini_mime (1.1.2) mini_portile2 (2.8.7) mini_racer (0.6.3) @@ -437,6 +458,7 @@ GEM msgpack (1.7.2) multi_xml (0.6.0) mustache (1.1.1) + mutex_m (0.2.0) net-imap (0.3.6) date net-protocol @@ -659,6 +681,8 @@ GEM pg (1.4.6) pgq_prometheus (0.2.3) prometheus_exporter + psych (5.2.0) + stringio public_suffix (4.0.6) puma (6.4.3) nio4r (~> 2.0) @@ -670,22 +694,27 @@ GEM raabro (1.4.0) racc (1.8.1) rack (2.2.8.1) + rack-session (1.0.2) + rack (< 3) rack-test (2.1.0) rack (>= 1.3) - rails (7.0.8.5) - actioncable (= 7.0.8.5) - actionmailbox (= 7.0.8.5) - actionmailer (= 7.0.8.5) - actionpack (= 7.0.8.5) - actiontext (= 7.0.8.5) - actionview (= 7.0.8.5) - activejob (= 7.0.8.5) - activemodel (= 7.0.8.5) - activerecord (= 7.0.8.5) - activestorage (= 7.0.8.5) - activesupport (= 7.0.8.5) + rackup (1.0.1) + rack (< 3) + webrick + rails (7.1.5) + actioncable (= 7.1.5) + actionmailbox (= 7.1.5) + actionmailer (= 7.1.5) + actionpack (= 7.1.5) + actiontext (= 7.1.5) + actionview (= 7.1.5) + activejob (= 7.1.5) + activemodel (= 7.1.5) + activerecord (= 7.1.5) + activestorage (= 7.1.5) + activesupport (= 7.1.5) bundler (>= 1.15.0) - railties (= 7.0.8.5) + railties (= 7.1.5) rails-dom-testing (2.2.0) activesupport (>= 5.0.0) minitest @@ -693,13 +722,14 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - railties (7.0.8.5) - actionpack (= 7.0.8.5) - activesupport (= 7.0.8.5) - method_source + railties (7.1.5) + actionpack (= 7.1.5) + activesupport (= 7.1.5) + 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.0.6) ransack (4.1.1) @@ -710,7 +740,11 @@ GEM rb-inotify (0.10.1) ffi (~> 1.0) rchardet (1.8.0) + rdoc (6.7.0) + psych (>= 4.0.0) regexp_parser (1.8.2) + reline (0.5.11) + io-console (~> 0.5) request_store (1.4.1) rack (>= 1.4) responders (3.0.1) @@ -773,6 +807,7 @@ GEM sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) + securerandom (0.3.1) selenium-webdriver (3.141.0) childprocess (~> 0.5) rubyzip (~> 1.2, >= 1.2.2) @@ -806,6 +841,7 @@ GEM actionpack (>= 5.2) activesupport (>= 5.2) sprockets (>= 3.0.0) + stringio (3.1.2) syslog-logger (1.6.8) text (1.3.1) thin (1.8.2) @@ -920,7 +956,7 @@ DEPENDENCIES puma_worker_killer pundit rack (~> 2.2.6) - rails (~> 7.0) + rails (~> 7.1.0) rails-html-sanitizer (~> 1.0) ransack responders diff --git a/config/initializers/print_timezone.rb b/config/initializers/print_timezone.rb index 0a9865fa2..abc1eb78f 100644 --- a/config/initializers/print_timezone.rb +++ b/config/initializers/print_timezone.rb @@ -5,10 +5,10 @@ warn "Yeti DB timezone #{::SqlCaller::Yeti.current_timezone}" warn "CDR DB timezone #{::SqlCaller::Cdr.current_timezone}" warn "ActiveRecord timezone #{Rails.application.config.active_record.default_timezone}" - ApplicationRecord.clear_active_connections! - ApplicationRecord.flush_idle_connections! - Cdr::Base.clear_active_connections! - Cdr::Base.flush_idle_connections! + ActiveRecord::Base.connection_handler.clear_active_connections!(:all) + ApplicationRecord.connection_handler.flush_idle_connections!(:all) + Cdr::Base.connection_handler.clear_active_connections!(:all) + Cdr::Base.connection_handler.flush_idle_connections!(:all) rescue StandardError => e warn "suppressed error during timezone print <#{e.class}>: #{e.message}" end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 81e15b403..97b937fc6 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -35,7 +35,7 @@ RSpec.configure do |config| # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures - config.fixture_path = Rails.root.join 'spec/fixtures' + config.fixture_paths = [Rails.root.join('spec/fixtures')] # If you're not using ActiveRecord, or you'd prefer not to run each of your # examples within a transaction, remove the following line or assign false