Merge branch 'rails-update-command' of github.com:dradis/dradis-ce in…

…to rails-7-fix-specs
dradis · Sep 28, 2023 · 0e815ed · 0e815ed
2 parents c8b3bdd + 481e1b2
commit 0e815ed
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Gemfile b/Gemfile
@@ -237,7 +237,7 @@ gem 'dradis-calculator_dread', '~> 4.10.0'
 
 # ---------------------------------------------------------------------- Export
 gem 'dradis-csv_export', '~> 4.10.0'
-gem 'dradis-html_export', github: 'dradis/dradis-html_export', branch: 'rails-7-compatibility'
+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,7 +1,7 @@
 GIT
   remote: https://github.com/dradis/dradis-html_export.git
-  revision: 308f8d4ba9009b2180ea7fb7466db1453b16a5a5
-  branch: rails-7-compatibility
+  revision: 70ccfe4e99d8cf077afe5aa5a97c73b2dd07049b
+  branch: rails-7-upgrade
   specs:
     dradis-html_export (4.10.1)
       RedCloth (~> 4.3.2)