Merge pull request #1303 from dradis/rails/upgrade-7.2

Upgrade Rails to 7.2

Author: caitmich

.github/workflows/ci.yml

@@ -19,6 +19,7 @@ jobs:
       - name: Install Ruby and gems
         uses: ruby/setup-ruby@v1
         with:
+          rubygems: 'latest'
           bundler-cache: true
       - name: Security audit dependencies
         run: bundle exec bundler-audit --update --ignore CVE-2023-50724 CVE-2023-50725 CVE-2023-50727 CVE-2024-21510
@@ -41,6 +42,7 @@ jobs:
       - name: Install Ruby and gems
         uses: ruby/setup-ruby@v1
         with:
+          rubygems: 'latest'
           bundler-cache: true
       - name: Lint changed files
         run: bin/rubocop-ci ${{ env.TARGET_BRANCH || env.PREV_SHA || env.FALLBACK_BRANCH }} ${{ env.IS_MERGE }}
@@ -58,6 +60,7 @@ jobs:
       - name: Install Ruby and gems
         uses: ruby/setup-ruby@v1
         with:
+          rubygems: 'latest'
           bundler-cache: true
       - name: Prepare database
         run: bundle exec rails db:prepare

CHANGELOG

@@ -5,7 +5,7 @@
     - Add View History link when viewing Issues/Content blocks
     - Automatically go to the next record after reviewing
   - Upgraded gems:
-    - net-imap, nokogiri, rack
+    - capybara, net-imap, nokogiri, paper_trail, rack, rails, rails-html-sanitizer, rexml, rspec-rails
   - Bugs fixes:
     - [entity]:
       - [future tense verb] [bug fix]

Gemfile

@@ -5,7 +5,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 ruby '3.1.2'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '~> 7.0.8.7'
+gem 'rails', '~> 7.2.2.1'
 
 # Use SCSS for stylesheets
 gem 'sass-rails', '~> 6.0'
@@ -56,7 +56,7 @@ gem 'liquid'
 
 gem 'kaminari', '~> 1.2.1'
 
-gem 'paper_trail', '~> 12.2.0'
+gem 'paper_trail', '~> 15.2.0'
 
 # gem 'rails_autolink', '~> 1.1'
 
@@ -98,7 +98,7 @@ gem 'nokogiri', '>= 1.18.3'
 # before 1.0.4, so make sure we're using 1.0.4+:
 # see https://github.com/rails/rails-html-sanitizer/commit/f3ba1a839a
 # and https://github.com/flavorjones/loofah/issues/144
-gem 'rails-html-sanitizer', '~> 1.4.4'
+gem 'rails-html-sanitizer', '~> 1.6.1'
 
 # Textile markup
 gem 'RedCloth', '~> 4.3.4', require: 'redcloth'
@@ -184,14 +184,14 @@ end
 group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
   gem 'byebug', platform: :mri
-
-  gem 'rspec-rails', '~> 4.0.2'
+  # rspec-rails < 7.0.0 does not support rails 7.2
+  gem 'rspec-rails', '~> 7.0.0'
 end
 
 group :test do
   gem 'database_cleaner'
   gem 'factory_bot_rails'
-  gem 'capybara', '~> 3.39'
+  gem 'capybara', '~> 3.40'
   gem 'guard-rspec', require: false
   gem 'selenium-webdriver', '~> 4.17'
   gem 'shoulda-matchers', '~> 3.1'
@@ -216,7 +216,7 @@ end
 #
 
 # Base framework classes required by other plugins
-gem 'dradis-plugins', '~> 4.15.0'
+gem 'dradis-plugins', github: 'dradis/dradis-plugins', branch: 'rails/upgrade-7.2'
 
 gem 'dradis-api', path: 'engines/dradis-api'
 
@@ -235,9 +235,10 @@ end
 
 gem 'dradis-calculator_cvss', github: 'dradis/dradis-calculator_cvss'
 gem 'dradis-calculator_dread', github: 'dradis/dradis-calculator_dread'
+
 # ---------------------------------------------------------------------- Export
 gem 'dradis-csv_export', '~> 4.15.0'
-gem 'dradis-html_export', '~> 4.15.0'
+gem 'dradis-html_export', github: 'dradis/dradis-html_export'
 
 # ---------------------------------------------------------------------- Import
 gem 'dradis-csv', '~> 4.15.0'