From 8870afe53ce67cd970603cdd91451cb487d452e0 Mon Sep 17 00:00:00 2001 From: Marc Anguera Insa Date: Fri, 8 Dec 2023 18:47:40 +0100 Subject: [PATCH 1/3] =?UTF-8?q?Upgrade=20to=20Ruby=203=20=F0=9F=92=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .ruby-version | 2 +- Gemfile | 12 +- Gemfile.lock | 243 ++++++++++++++-------------- app/controllers/posts_controller.rb | 3 - config/environments/development.rb | 4 - 5 files changed, 127 insertions(+), 137 deletions(-) diff --git a/.ruby-version b/.ruby-version index ec1cf33c3..be94e6f53 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.6.3 +3.2.2 diff --git a/Gemfile b/Gemfile index 386447c98..897b27dfc 100644 --- a/Gemfile +++ b/Gemfile @@ -5,7 +5,7 @@ gem 'rails-i18n', '~> 7.0' gem 'rdiscount', '~> 2.2.7' gem 'rubyzip', '~> 2.3.0' gem 'activeadmin', '~> 2.9.0' -gem 'bootsnap', '~> 1.12.0', require: false +gem 'bootsnap', '~> 1.12', require: false gem 'has_scope', '~> 0.7.2' gem 'pundit', '~> 2.1.0' gem 'pg', '~> 1.4' @@ -13,14 +13,14 @@ gem 'json_translate', '~> 4.0.0' gem 'devise', '~> 4.9.1' gem 'devise-i18n', '~> 1.11.0' gem 'http_accept_language', '~> 2.1.1' -gem 'unicorn', '~> 5.5.1' +gem 'unicorn', '~> 6.1.0' gem 'kaminari', '~> 1.2.1' gem 'simple_form', '~> 5.0.2' -gem 'rollbar', '~> 2.22.1' +gem 'rollbar', '~> 3.4' gem 'prawn', '~> 2.4.0' gem 'prawn-table', '~> 0.2.2' gem 'pg_search', '~> 2.3.5' -gem 'skylight', '~> 5.0' +gem 'skylight', '~> 6.0' gem 'sidekiq', '~> 6.5' gem 'sidekiq-cron', '~> 1.9.1' gem 'aws-sdk-s3', '~> 1.94', require: false @@ -35,11 +35,10 @@ gem 'uglifier', '~> 4.2.0' gem 'select2-rails', '~> 4.0.13' group :development do - gem 'listen', '~> 3.2.0' gem 'localeapp', '~> 3.3', require: false gem 'letter_opener', '~> 1.7.0' gem 'web-console', '~> 4.1.0' - gem 'capistrano', '~> 3.1' + gem 'capistrano', '~> 3.15.0' gem 'capistrano-rails', '~> 1.1' gem 'capistrano-rbenv', '~> 2.1' end @@ -62,4 +61,5 @@ group :test do gem 'selenium-webdriver', '~> 4.1.0' gem 'webdrivers', '~> 5.3' gem 'simplecov', '~> 0.22', require: false + gem 'webrick' end diff --git a/Gemfile.lock b/Gemfile.lock index 2fb288110..cb733a3f9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -76,33 +76,33 @@ GEM zeitwerk (~> 2.3) addressable (2.8.5) public_suffix (>= 2.0.2, < 6.0) - airbrussh (1.4.0) + airbrussh (1.5.0) sshkit (>= 1.6.1, != 1.7.0) - arbre (1.4.0) - activesupport (>= 3.0.0, < 6.2) - ruby2_keywords (>= 0.0.2, < 1.0) + arbre (1.7.0) + activesupport (>= 3.0.0) + ruby2_keywords (>= 0.0.2) ast (2.4.2) - autoprefixer-rails (10.4.13.0) + autoprefixer-rails (10.4.16.0) execjs (~> 2) - aws-eventstream (1.1.1) - aws-partitions (1.451.0) - aws-sdk-core (3.114.0) - aws-eventstream (~> 1, >= 1.0.2) - aws-partitions (~> 1, >= 1.239.0) + aws-eventstream (1.3.0) + aws-partitions (1.864.0) + aws-sdk-core (3.190.0) + aws-eventstream (~> 1, >= 1.3.0) + aws-partitions (~> 1, >= 1.651.0) + aws-sigv4 (~> 1.8) + jmespath (~> 1, >= 1.6.1) + aws-sdk-kms (1.74.0) + aws-sdk-core (~> 3, >= 3.188.0) aws-sigv4 (~> 1.1) - jmespath (~> 1.0) - aws-sdk-kms (1.43.0) - aws-sdk-core (~> 3, >= 3.112.0) - aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.94.1) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-s3 (1.141.0) + aws-sdk-core (~> 3, >= 3.189.0) aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.1) - aws-sigv4 (1.2.3) + aws-sigv4 (~> 1.8) + aws-sigv4 (1.8.0) aws-eventstream (~> 1, >= 1.0.2) - bcrypt (3.1.18) + bcrypt (3.1.20) bindex (0.8.1) - bootsnap (1.12.0) + bootsnap (1.17.0) msgpack (~> 1.2) bootstrap-sass (3.4.1) autoprefixer-rails (>= 5.2.1) @@ -114,15 +114,15 @@ GEM i18n rake (>= 10.0.0) sshkit (>= 1.9.0) - capistrano-bundler (2.0.1) + capistrano-bundler (2.1.0) capistrano (~> 3.1) - capistrano-rails (1.6.1) + capistrano-rails (1.6.3) capistrano (~> 3.1) capistrano-bundler (>= 1.1, < 3) capistrano-rbenv (2.2.0) capistrano (~> 3.1) sshkit (~> 1.3) - capybara (3.36.0) + capybara (3.39.2) addressable matrix mini_mime (>= 0.1.3) @@ -137,18 +137,17 @@ GEM crass (1.0.6) database_cleaner (1.8.5) date (3.3.4) - devise (4.9.1) + devise (4.9.3) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0) responders warden (~> 1.2.3) - devise-i18n (1.11.0) + devise-i18n (1.11.1) devise (>= 4.9.0) - diff-lcs (1.4.4) + diff-lcs (1.5.0) docile (1.4.0) - domain_name (0.5.20190701) - unf (>= 0.0.5, < 1.0.0) + domain_name (0.6.20231109) dotenv (2.7.6) dotenv-rails (2.7.6) dotenv (= 2.7.6) @@ -156,18 +155,18 @@ GEM erubi (1.12.0) et-orbi (1.2.7) tzinfo - execjs (2.8.1) - fabrication (2.22.0) - faker (2.17.0) - i18n (>= 1.6, < 2) - ffi (1.15.5) + execjs (2.9.1) + fabrication (2.31.0) + faker (2.23.0) + i18n (>= 1.8.11, < 2) + ffi (1.16.3) formtastic (4.0.0) actionpack (>= 5.2.0) - formtastic_i18n (0.6.0) + formtastic_i18n (0.7.0) fugit (1.9.0) et-orbi (~> 1, >= 1.2.7) raabro (~> 1.4) - gli (2.21.0) + gli (2.21.1) globalid (1.2.1) activesupport (>= 6.1) has_scope (0.7.2) @@ -182,39 +181,37 @@ GEM image_processing (1.12.2) mini_magick (>= 4.9.5, < 5) ruby-vips (>= 2.0.17, < 3) - inherited_resources (1.12.0) - actionpack (>= 5.2, < 6.2) - has_scope (~> 0.6) - railties (>= 5.2, < 6.2) - responders (>= 2, < 4) - jmespath (1.6.1) + inherited_resources (1.14.0) + actionpack (>= 6.0) + has_scope (>= 0.6) + railties (>= 6.0) + responders (>= 2) + jmespath (1.6.2) jquery-rails (4.4.0) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - json (2.6.3) + json (2.7.1) json_translate (4.0.1) activerecord (>= 4.2.0) - kaminari (1.2.1) + kaminari (1.2.2) activesupport (>= 4.1.0) - kaminari-actionview (= 1.2.1) - kaminari-activerecord (= 1.2.1) - kaminari-core (= 1.2.1) - kaminari-actionview (1.2.1) + kaminari-actionview (= 1.2.2) + kaminari-activerecord (= 1.2.2) + kaminari-core (= 1.2.2) + kaminari-actionview (1.2.2) actionview - kaminari-core (= 1.2.1) - kaminari-activerecord (1.2.1) + kaminari-core (= 1.2.2) + kaminari-activerecord (1.2.2) activerecord - kaminari-core (= 1.2.1) - kaminari-core (1.2.1) - kgio (2.11.3) - launchy (2.5.0) - addressable (~> 2.7) + kaminari-core (= 1.2.2) + kaminari-core (1.2.2) + kgio (2.11.4) + language_server-protocol (3.17.0.3) + launchy (2.5.2) + addressable (~> 2.8) letter_opener (1.7.0) launchy (~> 2.2) - listen (3.2.1) - rb-fsevent (~> 0.10, >= 0.10.3) - rb-inotify (~> 0.9, >= 0.9.10) localeapp (3.3.0) gli i18n (>= 0.7, < 2) @@ -231,38 +228,39 @@ GEM marcel (1.0.2) matrix (0.4.2) method_source (1.0.0) - mime-types (3.4.1) + mime-types (3.5.1) mime-types-data (~> 3.2015) - mime-types-data (3.2022.0105) - mini_magick (4.11.0) + mime-types-data (3.2023.1205) + mini_magick (4.12.0) mini_mime (1.1.5) mini_portile2 (2.8.5) minitest (5.20.0) - msgpack (1.5.2) - net-imap (0.3.7) + msgpack (1.7.2) + net-imap (0.4.7) date net-protocol net-pop (0.1.2) net-protocol net-protocol (0.2.2) timeout - net-scp (3.0.0) - net-ssh (>= 2.6.5, < 7.0.0) + net-scp (4.0.0) + net-ssh (>= 2.6.5, < 8.0.0) net-smtp (0.4.0) net-protocol - net-ssh (6.1.0) + net-ssh (7.2.0) netrc (0.11.0) - nio4r (2.6.0) - nokogiri (1.13.10) - mini_portile2 (~> 2.8.0) + nio4r (2.7.0) + nokogiri (1.15.5) + mini_portile2 (~> 2.8.2) racc (~> 1.4) orm_adapter (0.5.0) - parallel (1.20.1) - parser (3.0.1.1) + parallel (1.23.0) + parser (3.2.2.4) ast (~> 2.4.1) + racc pdf-core (0.9.0) - pg (1.4.6) - pg_search (2.3.5) + pg (1.5.4) + pg_search (2.3.6) activerecord (>= 5.2) activesupport (>= 5.2) prawn (2.4.0) @@ -271,7 +269,7 @@ GEM prawn-table (0.2.2) prawn (>= 1.3.0, < 3.0.0) public_suffix (5.0.4) - pundit (2.1.0) + pundit (2.1.1) activesupport (>= 3.0.0) raabro (1.4.0) racc (1.7.3) @@ -301,8 +299,9 @@ GEM activesupport (>= 5.0.0) minitest nokogiri (>= 1.6) - rails-html-sanitizer (1.5.0) - loofah (~> 2.19, >= 2.19.1) + rails-html-sanitizer (1.6.0) + loofah (~> 2.21) + nokogiri (~> 1.14) rails-i18n (7.0.8) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 8) @@ -312,37 +311,34 @@ GEM method_source rake (>= 12.2) thor (~> 1.0) - rainbow (3.0.0) - raindrops (0.19.1) + rainbow (3.1.1) + raindrops (0.20.1) rake (13.1.0) - ransack (2.4.2) - activerecord (>= 5.2.4) - activesupport (>= 5.2.4) + ransack (2.6.0) + activerecord (>= 6.0.4) + activesupport (>= 6.0.4) i18n - rb-fsevent (0.10.4) - rb-inotify (0.10.1) - ffi (~> 1.0) - rdiscount (2.2.7) + rdiscount (2.2.7.1) redis (4.8.1) - regexp_parser (2.8.2) - responders (3.0.1) - actionpack (>= 5.0) - railties (>= 5.0) + regexp_parser (2.8.3) + responders (3.1.1) + actionpack (>= 5.2) + railties (>= 5.2) rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - rexml (3.2.5) - rollbar (2.22.1) - rspec-core (3.10.1) - rspec-support (~> 3.10.0) - rspec-expectations (3.10.1) + rexml (3.2.6) + rollbar (3.4.2) + rspec-core (3.12.2) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.3) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) - rspec-mocks (3.10.2) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.6) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) + rspec-support (~> 3.12.0) rspec-rails (4.0.2) actionpack (>= 4.2) activesupport (>= 4.2) @@ -351,26 +347,29 @@ GEM rspec-expectations (~> 3.10) rspec-mocks (~> 3.10) rspec-support (~> 3.10) - rspec-support (3.10.2) - rubocop (1.13.0) + rspec-support (3.12.1) + rubocop (1.58.0) + json (~> 2.3) + language_server-protocol (>= 3.17.0) parallel (~> 1.10) - parser (>= 3.0.0.0) + parser (>= 3.2.2.4) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) - rexml - rubocop-ast (>= 1.2.0, < 2.0) + rexml (>= 3.2.5, < 4.0) + rubocop-ast (>= 1.30.0, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.5.0) - parser (>= 3.0.1.1) - rubocop-rails (2.9.1) + unicode-display_width (>= 2.4.0, < 3.0) + rubocop-ast (1.30.0) + parser (>= 3.2.1.0) + rubocop-rails (2.22.2) activesupport (>= 4.2.0) rack (>= 1.1) - rubocop (>= 0.90.0, < 2.0) - ruby-progressbar (1.11.0) - ruby-vips (2.1.4) + rubocop (>= 1.33.0, < 2.0) + rubocop-ast (>= 1.30.0, < 2.0) + ruby-progressbar (1.13.0) + ruby-vips (2.2.0) ffi (~> 1.12) - ruby2_keywords (0.0.4) + ruby2_keywords (0.0.5) rubyzip (2.3.2) sassc (2.4.0) ffi (~> 1.9) @@ -403,7 +402,7 @@ GEM simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) - skylight (5.0.1) + skylight (6.0.1) activesupport (>= 5.2.0) sprockets (4.2.1) concurrent-ruby (~> 1.0) @@ -412,22 +411,19 @@ GEM actionpack (>= 5.2) activesupport (>= 5.2) sprockets (>= 3.0.0) - sshkit (1.21.2) + sshkit (1.21.6) net-scp (>= 1.1.2) net-ssh (>= 2.8.0) thor (1.3.0) - tilt (2.0.10) + tilt (2.3.0) timeout (0.4.1) ttfunk (1.7.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) uglifier (4.2.0) execjs (>= 0.3.0, < 3) - unf (0.1.4) - unf_ext - unf_ext (0.0.8.2) - unicode-display_width (2.0.0) - unicorn (5.5.5) + unicode-display_width (2.5.0) + unicorn (6.1.0) kgio (~> 2.6) raindrops (~> 0.7) warden (1.2.9) @@ -441,6 +437,7 @@ GEM nokogiri (~> 1.6) rubyzip (>= 1.3.0) selenium-webdriver (~> 4.0, < 4.11) + webrick (1.8.1) websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) @@ -455,10 +452,10 @@ DEPENDENCIES active_storage_validations (~> 1.1.3) activeadmin (~> 2.9.0) aws-sdk-s3 (~> 1.94) - bootsnap (~> 1.12.0) + bootsnap (~> 1.12) bootstrap-sass (~> 3.4) byebug (~> 11.0) - capistrano (~> 3.1) + capistrano (~> 3.15.0) capistrano-rails (~> 1.1) capistrano-rbenv (~> 2.1) capybara (~> 3.29) @@ -475,7 +472,6 @@ DEPENDENCIES json_translate (~> 4.0.0) kaminari (~> 1.2.1) letter_opener (~> 1.7.0) - listen (~> 3.2.0) localeapp (~> 3.3) pg (~> 1.4) pg_search (~> 2.3.5) @@ -486,7 +482,7 @@ DEPENDENCIES rails-controller-testing rails-i18n (~> 7.0) rdiscount (~> 2.2.7) - rollbar (~> 2.22.1) + rollbar (~> 3.4) rspec-rails (~> 4.0.0) rubocop (~> 1.6) rubocop-rails (~> 2.9) @@ -499,11 +495,12 @@ DEPENDENCIES sidekiq-cron (~> 1.9.1) simple_form (~> 5.0.2) simplecov (~> 0.22) - skylight (~> 5.0) + skylight (~> 6.0) uglifier (~> 4.2.0) - unicorn (~> 5.5.1) + unicorn (~> 6.1.0) web-console (~> 4.1.0) webdrivers (~> 5.3) + webrick BUNDLED WITH 2.1.4 diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb index 373c6cee8..5a8e3616b 100644 --- a/app/controllers/posts_controller.rb +++ b/app/controllers/posts_controller.rb @@ -44,9 +44,6 @@ def edit instance_variable_set("@#{resource}", post) end - # GET /offers/:id - # GET /inquiries/:id - # def show post = Post.active.of_active_members.find(params[:id]) update_current_organization!(post.organization) diff --git a/config/environments/development.rb b/config/environments/development.rb index c2189cb2a..000e5f03b 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -64,8 +64,4 @@ # Raises error for missing translations. # config.action_view.raise_on_missing_translations = true - - # Use an evented file watcher to asynchronously detect changes in source code, - # routes, locales, etc. This feature depends on the listen gem. - config.file_watcher = ActiveSupport::EventedFileUpdateChecker end From 0feec4eb7d39fe70f1b7662542b55cadc2249b29 Mon Sep 17 00:00:00 2001 From: Marc Anguera Insa Date: Sat, 9 Dec 2023 16:44:01 +0100 Subject: [PATCH 2/3] [testing] upgrade selenium-webdriver to latest version (no need to use webdrivers anymore) --- Gemfile | 3 +-- Gemfile.lock | 17 ++++++----------- spec/spec_helper.rb | 1 - 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/Gemfile b/Gemfile index 897b27dfc..4656d71d6 100644 --- a/Gemfile +++ b/Gemfile @@ -58,8 +58,7 @@ group :test do gem 'fabrication', '~> 2.20' gem 'faker', '~> 2.15' gem 'capybara', '~> 3.29' - gem 'selenium-webdriver', '~> 4.1.0' - gem 'webdrivers', '~> 5.3' + gem 'selenium-webdriver', '~> 4.16' gem 'simplecov', '~> 0.22', require: false gem 'webrick' end diff --git a/Gemfile.lock b/Gemfile.lock index cb733a3f9..47ee601c0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -74,7 +74,7 @@ GEM minitest (>= 5.1) tzinfo (~> 2.0) zeitwerk (~> 2.3) - addressable (2.8.5) + addressable (2.8.6) public_suffix (>= 2.0.2, < 6.0) airbrussh (1.5.0) sshkit (>= 1.6.1, != 1.7.0) @@ -131,7 +131,6 @@ GEM rack-test (>= 0.6.3) regexp_parser (>= 1.5, < 3.0) xpath (~> 3.2) - childprocess (4.1.0) concurrent-ruby (1.2.2) connection_pool (2.4.1) crass (1.0.6) @@ -380,10 +379,10 @@ GEM sprockets-rails tilt select2-rails (4.0.13) - selenium-webdriver (4.1.0) - childprocess (>= 0.5, < 5.0) + selenium-webdriver (4.16.0) rexml (~> 3.2, >= 3.2.5) - rubyzip (>= 1.2.2) + rubyzip (>= 1.2.2, < 3.0) + websocket (~> 1.0) shoulda-matchers (4.5.1) activesupport (>= 4.2.0) sidekiq (6.5.12) @@ -433,11 +432,8 @@ GEM activemodel (>= 6.0.0) bindex (>= 0.4.0) railties (>= 6.0.0) - webdrivers (5.3.1) - nokogiri (~> 1.6) - rubyzip (>= 1.3.0) - selenium-webdriver (~> 4.0, < 4.11) webrick (1.8.1) + websocket (1.2.10) websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) @@ -489,7 +485,7 @@ DEPENDENCIES rubyzip (~> 2.3.0) sassc-rails (~> 2.1.2) select2-rails (~> 4.0.13) - selenium-webdriver (~> 4.1.0) + selenium-webdriver (~> 4.16) shoulda-matchers (~> 4.4) sidekiq (~> 6.5) sidekiq-cron (~> 1.9.1) @@ -499,7 +495,6 @@ DEPENDENCIES uglifier (~> 4.2.0) unicorn (~> 6.1.0) web-console (~> 4.1.0) - webdrivers (~> 5.3) webrick BUNDLED WITH diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 1ab96aa99..435df653c 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -17,7 +17,6 @@ require 'capybara/rspec' require 'database_cleaner' require 'fabrication' -require 'webdrivers' require 'selenium/webdriver' require 'faker' require 'shoulda/matchers' From 1a525bf1a11b68c0c715c98fe60f26b3f1d0ceab Mon Sep 17 00:00:00 2001 From: Marc Anguera Insa Date: Sat, 9 Dec 2023 17:34:57 +0100 Subject: [PATCH 3/3] Upgrade to Rails v7 --- Gemfile | 8 +-- Gemfile.lock | 161 ++++++++++++++++++++++-------------------- config/application.rb | 2 +- 3 files changed, 91 insertions(+), 80 deletions(-) diff --git a/Gemfile b/Gemfile index 4656d71d6..07ddbb5fb 100644 --- a/Gemfile +++ b/Gemfile @@ -1,10 +1,10 @@ source 'https://rubygems.org' -gem 'rails', '~> 6.1.1' +gem 'rails', '~> 7.0.8' gem 'rails-i18n', '~> 7.0' gem 'rdiscount', '~> 2.2.7' gem 'rubyzip', '~> 2.3.0' -gem 'activeadmin', '~> 2.9.0' +gem 'activeadmin', '~> 2.14' gem 'bootsnap', '~> 1.12', require: false gem 'has_scope', '~> 0.7.2' gem 'pundit', '~> 2.1.0' @@ -51,9 +51,9 @@ group :development, :test do end group :test do - gem 'rspec-rails', '~> 4.0.0' + gem 'rspec-rails', '~> 6.0' gem 'rails-controller-testing' - gem 'database_cleaner', '~> 1.8.5' + gem 'database_cleaner', '~> 2.0' gem 'shoulda-matchers', '~> 4.4' gem 'fabrication', '~> 2.20' gem 'faker', '~> 2.15' diff --git a/Gemfile.lock b/Gemfile.lock index 47ee601c0..832e67773 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,40 +1,47 @@ GEM remote: https://rubygems.org/ specs: - actioncable (6.1.7.6) - actionpack (= 6.1.7.6) - activesupport (= 6.1.7.6) + actioncable (7.0.8) + actionpack (= 7.0.8) + activesupport (= 7.0.8) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.1.7.6) - actionpack (= 6.1.7.6) - activejob (= 6.1.7.6) - activerecord (= 6.1.7.6) - activestorage (= 6.1.7.6) - activesupport (= 6.1.7.6) + actionmailbox (7.0.8) + actionpack (= 7.0.8) + activejob (= 7.0.8) + activerecord (= 7.0.8) + activestorage (= 7.0.8) + activesupport (= 7.0.8) mail (>= 2.7.1) - actionmailer (6.1.7.6) - actionpack (= 6.1.7.6) - actionview (= 6.1.7.6) - activejob (= 6.1.7.6) - activesupport (= 6.1.7.6) + net-imap + net-pop + net-smtp + actionmailer (7.0.8) + actionpack (= 7.0.8) + actionview (= 7.0.8) + activejob (= 7.0.8) + activesupport (= 7.0.8) mail (~> 2.5, >= 2.5.4) + net-imap + net-pop + net-smtp rails-dom-testing (~> 2.0) - actionpack (6.1.7.6) - actionview (= 6.1.7.6) - activesupport (= 6.1.7.6) - rack (~> 2.0, >= 2.0.9) + actionpack (7.0.8) + actionview (= 7.0.8) + activesupport (= 7.0.8) + rack (~> 2.0, >= 2.2.4) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.1.7.6) - actionpack (= 6.1.7.6) - activerecord (= 6.1.7.6) - activestorage (= 6.1.7.6) - activesupport (= 6.1.7.6) + actiontext (7.0.8) + actionpack (= 7.0.8) + activerecord (= 7.0.8) + activestorage (= 7.0.8) + activesupport (= 7.0.8) + globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (6.1.7.6) - activesupport (= 6.1.7.6) + actionview (7.0.8) + activesupport (= 7.0.8) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) @@ -44,36 +51,35 @@ GEM activemodel (>= 5.2.0) activestorage (>= 5.2.0) activesupport (>= 5.2.0) - activeadmin (2.9.0) + activeadmin (2.14.0) arbre (~> 1.2, >= 1.2.1) formtastic (>= 3.1, < 5.0) formtastic_i18n (~> 0.4) inherited_resources (~> 1.7) jquery-rails (~> 4.2) kaminari (~> 1.0, >= 1.2.1) - railties (>= 5.2, < 6.2) - ransack (~> 2.1, >= 2.1.1) - activejob (6.1.7.6) - activesupport (= 6.1.7.6) + railties (>= 6.1, < 7.1) + ransack (>= 2.1.1, < 4) + activejob (7.0.8) + activesupport (= 7.0.8) globalid (>= 0.3.6) - activemodel (6.1.7.6) - activesupport (= 6.1.7.6) - activerecord (6.1.7.6) - activemodel (= 6.1.7.6) - activesupport (= 6.1.7.6) - activestorage (6.1.7.6) - actionpack (= 6.1.7.6) - activejob (= 6.1.7.6) - activerecord (= 6.1.7.6) - activesupport (= 6.1.7.6) + activemodel (7.0.8) + activesupport (= 7.0.8) + activerecord (7.0.8) + activemodel (= 7.0.8) + activesupport (= 7.0.8) + activestorage (7.0.8) + actionpack (= 7.0.8) + activejob (= 7.0.8) + activerecord (= 7.0.8) + activesupport (= 7.0.8) marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (6.1.7.6) + activesupport (7.0.8) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - zeitwerk (~> 2.3) addressable (2.8.6) public_suffix (>= 2.0.2, < 6.0) airbrussh (1.5.0) @@ -134,7 +140,12 @@ GEM concurrent-ruby (1.2.2) connection_pool (2.4.1) crass (1.0.6) - database_cleaner (1.8.5) + database_cleaner (2.0.2) + database_cleaner-active_record (>= 2, < 3) + database_cleaner-active_record (2.1.0) + activerecord (>= 5.a) + database_cleaner-core (~> 2.0.0) + database_cleaner-core (2.0.1) date (3.3.4) devise (4.9.3) bcrypt (~> 3.0) @@ -275,21 +286,20 @@ GEM rack (2.2.8) rack-test (2.1.0) rack (>= 1.3) - rails (6.1.7.6) - actioncable (= 6.1.7.6) - actionmailbox (= 6.1.7.6) - actionmailer (= 6.1.7.6) - actionpack (= 6.1.7.6) - actiontext (= 6.1.7.6) - actionview (= 6.1.7.6) - activejob (= 6.1.7.6) - activemodel (= 6.1.7.6) - activerecord (= 6.1.7.6) - activestorage (= 6.1.7.6) - activesupport (= 6.1.7.6) + rails (7.0.8) + actioncable (= 7.0.8) + actionmailbox (= 7.0.8) + actionmailer (= 7.0.8) + actionpack (= 7.0.8) + actiontext (= 7.0.8) + actionview (= 7.0.8) + activejob (= 7.0.8) + activemodel (= 7.0.8) + activerecord (= 7.0.8) + activestorage (= 7.0.8) + activesupport (= 7.0.8) bundler (>= 1.15.0) - railties (= 6.1.7.6) - sprockets-rails (>= 2.0.0) + railties (= 7.0.8) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) @@ -304,18 +314,19 @@ GEM rails-i18n (7.0.8) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 8) - railties (6.1.7.6) - actionpack (= 6.1.7.6) - activesupport (= 6.1.7.6) + railties (7.0.8) + actionpack (= 7.0.8) + activesupport (= 7.0.8) method_source rake (>= 12.2) thor (~> 1.0) + zeitwerk (~> 2.5) rainbow (3.1.1) raindrops (0.20.1) rake (13.1.0) - ransack (2.6.0) - activerecord (>= 6.0.4) - activesupport (>= 6.0.4) + ransack (3.2.1) + activerecord (>= 6.1.5) + activesupport (>= 6.1.5) i18n rdiscount (2.2.7.1) redis (4.8.1) @@ -338,14 +349,14 @@ GEM rspec-mocks (3.12.6) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) - rspec-rails (4.0.2) - actionpack (>= 4.2) - activesupport (>= 4.2) - railties (>= 4.2) - rspec-core (~> 3.10) - rspec-expectations (~> 3.10) - rspec-mocks (~> 3.10) - rspec-support (~> 3.10) + rspec-rails (6.1.0) + actionpack (>= 6.1) + activesupport (>= 6.1) + railties (>= 6.1) + rspec-core (~> 3.12) + rspec-expectations (~> 3.12) + rspec-mocks (~> 3.12) + rspec-support (~> 3.12) rspec-support (3.12.1) rubocop (1.58.0) json (~> 2.3) @@ -446,7 +457,7 @@ PLATFORMS DEPENDENCIES active_storage_validations (~> 1.1.3) - activeadmin (~> 2.9.0) + activeadmin (~> 2.14) aws-sdk-s3 (~> 1.94) bootsnap (~> 1.12) bootstrap-sass (~> 3.4) @@ -455,7 +466,7 @@ DEPENDENCIES capistrano-rails (~> 1.1) capistrano-rbenv (~> 2.1) capybara (~> 3.29) - database_cleaner (~> 1.8.5) + database_cleaner (~> 2.0) devise (~> 4.9.1) devise-i18n (~> 1.11.0) dotenv-rails (~> 2.7.1) @@ -474,12 +485,12 @@ DEPENDENCIES prawn (~> 2.4.0) prawn-table (~> 0.2.2) pundit (~> 2.1.0) - rails (~> 6.1.1) + rails (~> 7.0.8) rails-controller-testing rails-i18n (~> 7.0) rdiscount (~> 2.2.7) rollbar (~> 3.4) - rspec-rails (~> 4.0.0) + rspec-rails (~> 6.0) rubocop (~> 1.6) rubocop-rails (~> 2.9) rubyzip (~> 2.3.0) diff --git a/config/application.rb b/config/application.rb index 2598506d6..c8e9a4af5 100644 --- a/config/application.rb +++ b/config/application.rb @@ -9,7 +9,7 @@ module Timeoverflow class Application < Rails::Application # Initialize configuration defaults for originally generated Rails version. - config.load_defaults 6.1 + config.load_defaults 7.0 # I18n configuration config.i18n.default_locale = :es