Merge pull request #1189 from dradis/rails-7-upgrade

Rails 7 upgrade feature
dradis · Nov 2, 2023 · 99b9caf · 99b9caf
2 parents 9cc2f89 + 73933f7
commit 99b9caf
Show file tree

Hide file tree

Showing 34 changed files with 302 additions and 227 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,6 +1,6 @@
 [v#.#.#] ([month] [YYYY])
-  - [entity]:
-    - [future tense verb] [feature]
+  - Upgrade to Rails 7.0.8
+  - Add importmap-rails to handle js libraries
   - Upgraded gems:
     - [gem]
   - Bugs fixes:

diff --git a/Gemfile b/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', '~> 6.1.7.6'
+gem 'rails', '~> 7.0.8'
 
 # Use SCSS for stylesheets
 gem 'sass-rails', '~> 6.0'
@@ -69,6 +69,10 @@ gem 'time', '>= 0.2.2'
 
 gem 'font-awesome-sass', '~> 6.4.0'
 
+gem 'importmap-rails', '~> 1.2'
+
+gem 'sprockets-rails', '>= 3.0.0'
+
 # ------------------------------------------------------ With native extensions
 # These require native extensions.
 # Ensure Traveling Ruby provides an appropriate version before bumping.
@@ -152,7 +156,7 @@ group :development do
   # Display performance information such as SQL time and flame graphs for each request in your browser.
   # Can be configured to work on production as well see: https://github.com/MiniProfiler/rack-mini-profiler/blob/master/README.md
   gem 'rack-mini-profiler', '~> 2.0'
-  gem 'listen', '~> 3.3'
+  gem 'listen'
 
   # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
   gem 'spring'
@@ -237,7 +241,7 @@ gem 'dradis-calculator_dread', '~> 4.10.0'
 
 # ---------------------------------------------------------------------- Export
 gem 'dradis-csv_export', '~> 4.10.0'
-gem 'dradis-html_export', '~> 4.10.1'
+gem 'dradis-html_export', github: 'dradis/dradis-html_export', branch: 'rails-7-upgrade'
 
 # ---------------------------------------------------------------------- Import
 gem 'dradis-csv', '~> 4.10.0'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,3 +1,13 @@
+GIT
+  remote: https://github.com/dradis/dradis-html_export.git
+  revision: 70ccfe4e99d8cf077afe5aa5a97c73b2dd07049b
+  branch: rails-7-upgrade
+  specs:
+    dradis-html_export (4.10.1)
+      RedCloth (~> 4.3.2)
+      dradis-plugins (>= 4.8.0)
+      rails_autolink (~> 1.1)
+
 PATH
   remote: engines/dradis-api
   specs:
@@ -8,65 +18,71 @@ GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.3.2)
-    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)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.1.7.6)
-      activesupport (= 6.1.7.6)
+    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)
     acts_as_tree (2.9.1)
       activerecord (>= 3.0.0)
     addressable (2.8.0)
@@ -135,10 +151,6 @@ GEM
       dradis-plugins (~> 4.0)
     dradis-csv_export (4.10.0)
       dradis-plugins (>= 4.8.0)
-    dradis-html_export (4.10.1)
-      RedCloth (~> 4.3.2)
-      dradis-plugins (>= 4.8.0)
-      rails_autolink (~> 1.1)
     dradis-metasploit (4.10.0)
       dradis-plugins (~> 4.0)
       nokogiri (~> 1.3)
@@ -191,13 +203,13 @@ GEM
     factory_bot_rails (6.2.0)
       factory_bot (~> 6.2.0)
       railties (>= 5.0.0)
-    ffi (1.14.2)
+    ffi (1.15.5)
     font-awesome-sass (6.4.0)
       sassc (~> 2.0)
     foreman (0.87.0)
     formatador (0.2.5)
-    globalid (1.1.0)
-      activesupport (>= 5.0)
+    globalid (1.2.1)
+      activesupport (>= 6.1)
     guard (2.16.1)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
@@ -218,6 +230,9 @@ GEM
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     image_size (1.3.1)
+    importmap-rails (1.2.1)
+      actionpack (>= 6.0.0)
+      railties (>= 6.0.0)
     jbuilder (2.10.0)
       activesupport (>= 5.0.0)
     jquery-fileupload-rails (0.3.5)
@@ -254,7 +269,7 @@ GEM
     libv8-node (16.10.0.0-x86_64-darwin)
     libv8-node (16.10.0.0-x86_64-linux)
     liquid (5.0.1)
-    listen (3.4.1)
+    listen (3.8.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     local_time (2.1.0)
@@ -270,18 +285,18 @@ GEM
     marcel (1.0.2)
     matrix (0.4.2)
     method_source (0.9.2)
-    mini_mime (1.1.2)
-    mini_portile2 (2.8.2)
+    mini_mime (1.1.5)
+    mini_portile2 (2.8.4)
     mini_racer (0.6.2)
       libv8-node (~> 16.10.0.0)
-    minitest (5.18.1)
+    minitest (5.20.0)
     mono_logger (1.1.1)
     msgpack (1.5.2)
     multi_json (1.15.0)
     mustermann (2.0.2)
       ruby2_keywords (~> 0.0.1)
     nenv (0.3.0)
-    net-imap (0.3.6)
+    net-imap (0.3.7)
       date
       net-protocol
     net-pop (0.1.2)
@@ -291,14 +306,14 @@ GEM
     net-smtp (0.3.3)
       net-protocol
     nio4r (2.5.9)
-    nokogiri (1.15.3)
+    nokogiri (1.15.4)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.15.3-arm64-darwin)
+    nokogiri (1.15.4-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.15.3-x86_64-darwin)
+    nokogiri (1.15.4-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.15.3-x86_64-linux)
+    nokogiri (1.15.4-x86_64-linux)
       racc (~> 1.4)
     notiffany (0.1.3)
       nenv (~> 0.1)
@@ -320,28 +335,27 @@ GEM
     puma (5.6.7)
       nio4r (~> 2.0)
     racc (1.7.1)
-    rack (2.2.7)
+    rack (2.2.8)
     rack-mini-profiler (2.3.0)
       rack (>= 1.2.0)
     rack-protection (2.2.3)
       rack
     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-dom-testing (2.2.0)
       activesupport (>= 5.0.0)
       minitest
@@ -352,16 +366,17 @@ GEM
       actionview (> 3.1)
       activesupport (> 3.1)
       railties (> 3.1)
-    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.0)
     rake (13.0.6)
-    rb-fsevent (0.10.4)
+    rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     record_tag_helper (1.0.1)
@@ -455,7 +470,7 @@ GEM
       rack-protection (= 2.2.3)
       tilt (~> 2.0)
     spring (2.1.1)
-    sprockets (4.2.0)
+    sprockets (4.2.1)
       concurrent-ruby (~> 1.0)
       rack (>= 2.2.4, < 4)
     sprockets-rails (3.4.2)
@@ -529,7 +544,7 @@ DEPENDENCIES
   dradis-coreimpact (~> 4.10.0)
   dradis-csv (~> 4.10.0)
   dradis-csv_export (~> 4.10.0)
-  dradis-html_export (~> 4.10.1)
+  dradis-html_export!
   dradis-metasploit (~> 4.10.0)
   dradis-nessus (~> 4.10.0)
   dradis-netsparker (~> 4.10.0)
@@ -552,6 +567,7 @@ DEPENDENCIES
   guard-rspec
   html-pipeline
   image_size (~> 1.3.0)
+  importmap-rails (~> 1.2)
   jbuilder (~> 2.7)
   jquery-fileupload-rails (~> 0.3.4)
   jquery-hotkeys-rails
@@ -561,7 +577,7 @@ DEPENDENCIES
   kaminari (~> 1.2.1)
   letter_opener
   liquid
-  listen (~> 3.3)
+  listen
   local_time (>= 2.0.0)
   matrix
   mini_racer
@@ -574,7 +590,7 @@ DEPENDENCIES
   pg
   puma (~> 5.6.7)
   rack-mini-profiler (~> 2.0)
-  rails (~> 6.1.7.6)
+  rails (~> 7.0.8)
   rails-html-sanitizer (~> 1.4.4)
   record_tag_helper
   rerun
@@ -592,6 +608,7 @@ DEPENDENCIES
   simple_form
   sinatra (~> 2.2.3)
   spring
+  sprockets-rails (>= 3.0.0)
   sqlite3
   terser (~> 1.1)
   thor (~> 1.2.1)

diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js
@@ -1,3 +1,13 @@
+//= link application.css
+//= link setup/setup.css
+//= link tylium.css
+
+//= link legacy.application.js
+//= link tylium.js
+
+//= link_tree ../../javascript .js
+//= link_tree ../../../vendor/javascript .js
+
 //= link_tree ../images
-//= link_directory ../javascripts .js
-//= link_directory ../stylesheets .css
+
+//= link_tree ../../../vendor/assets
diff --git a/app/assets/javascripts/application.js → app/assets/javascripts/legacy.application.js b/app/assets/javascripts/application.js → app/assets/javascripts/legacy.application.js