Merge branch 'develop' into fix-heroku-1-click

.github/workflows/lint.yml

@@ -0,0 +1,23 @@
+name: Lint
+
+on:
+  pull_request:
+    branches:
+      - '*'
+
+env:
+  TARGET_BRANCH: ${{ github.base_ref }}
+
+jobs:
+  rubocop:
+    name: RuboCop
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v1
+      - name: Install Ruby and gems
+        uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+      - name: Lint changed files
+        run: bin/rubocop-ci ${{ env.TARGET_BRANCH }}

.rubocop.yml

@@ -1,8 +1,8 @@
 AllCops:
-  TargetRubyVersion: 2.4
   # RuboCop has a bunch of cops enabled by default. This setting tells RuboCop
   # to ignore them, so only the ones explicitly set in this file are enabled.
   DisabledByDefault: true
+  SuggestExtensions: false
   Exclude:
     - '**/templates/**/*'
     - '**/vendor/**/*'
@@ -13,7 +13,7 @@ Style/AndOr:
 
 # Do not use braces for hash literals when they are the last argument of a
 # method call.
-Style/BracesAroundHashParameters:
+Style/HashAsLastArrayItem:
   Enabled: true
 
 # Align `when` with `case`.
@@ -43,7 +43,7 @@ Layout/EmptyLinesAroundMethodBody:
 Layout/EmptyLinesAroundModuleBody:
   Enabled: true
 
-Layout/IndentFirstArgument:
+Layout/FirstArgumentIndentation:
   Enabled: true
 
 # Use Ruby >= 1.9 syntax for hashes. Prefer { a: :b } over { :a => :b }.
@@ -82,10 +82,6 @@ Layout/SpaceBeforeFirstArg:
 Style/MethodDefParentheses:
   Enabled: true
 
-Style/FrozenStringLiteralComment:
-  Enabled: true
-  EnforcedStyle: always
-
 # Use `foo {}` not `foo{}`.
 Layout/SpaceBeforeBlockBraces:
   Enabled: true
@@ -107,19 +103,19 @@ Style/StringLiterals:
   EnforcedStyle: single_quotes
 
 # Detect hard tabs, no hard tabs.
-Layout/Tab:
+Layout/IndentationStyle:
   Enabled: true
 
 # Blank lines should not have any spaces.
-Layout/TrailingBlankLines:
+Layout/TrailingEmptyLines:
   Enabled: true
 
 # No trailing whitespace.
 Layout/TrailingWhitespace:
   Enabled: true
 
 # Use quotes for string literals when they are enough.
-Style/UnneededPercentQ:
+Style/RedundantPercentQ:
   Enabled: true
 
 # Align `end` with the matching keyword or starting expression except for
@@ -131,4 +127,3 @@ Layout/EndAlignment:
 # Use my_method(my_arg) not my_method( my_arg ) or my_method my_arg.
 Lint/RequireParentheses:
   Enabled: true
-

CHANGELOG

@@ -1,17 +1,15 @@
 [v#.#.#] ([month] [YYYY])
-  - Notes: remove category selection from form UI.
   - [entity]:
     - [future tense verb] [feature]
   - Upgraded gems:
-    - nokogiri
+    - [gem]
   - Bugs fixes:
     - [entity]:
       - [future tense verb] [bug fix]
     - Bug tracker items:
       - [item]
   - New integrations:
-    - Core Impact
-    - Veracode
+    - [integration]
   - Integration enhancements:
     - [integration]:
       - [future tense verb] [integration enhancement]
@@ -28,6 +26,18 @@
     - Medium: (Authenticated|Unauthenticated) (admin|author|contributor) [vulnerability description]
     - Low: (Authenticated|Unauthenticated) (admin|author|contributor) [vulnerability description]
 
+v4.6.0 (November 2022)
+  - Kit Import: allow import of kit with no templates
+  - Notes: remove category selection from form UI.
+  - Rubocop: lint changed files since previous commit
+  - Upgraded gems:
+    - nokogiri
+  - Bugs fixes:
+    - Comments: Align comment header content in Safari
+  - New integrations:
+    - Core Impact
+    - Veracode
+
 v4.5.0 (August 2022)
   - Upgraded Dradis to run on ruby 3.1.2
   - Upgraded gems: acts_as_tree, bootsnap, bundler-audit, factory_bot, paper_trail, rails, rails-html-sanitizer, timecop, thor, unicorn

Gemfile

@@ -22,7 +22,6 @@ gem 'coffee-rails', '~> 5.0'
 # Cache-friendly, client-side local time
 gem 'local_time', '>= 2.0.0'
 
-
 # Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
 gem 'turbolinks', '~> 5'
 
@@ -49,7 +48,6 @@ gem 'builder'
 
 gem 'differ', '~> 0.1.2'
 
-
 # HTML processing filters and utilities
 gem 'html-pipeline'
 gem 'liquid'
@@ -66,7 +64,6 @@ gem 'rubyzip', '>= 1.2.2'
 
 gem 'thor', '~> 1.2.1'
 
-
 # ------------------------------------------------------ With native extensions
 # These require native extensions.
 # Ensure Traveling Ruby provides an appropriate version before bumping.
@@ -75,7 +72,7 @@ gem 'thor', '~> 1.2.1'
 
 # Use Active Model has_secure_password
 # Password digests
-gem 'bcrypt',   '3.1.12'
+gem 'bcrypt', '3.1.12'
 
 # Required by Rails (uglifier and activesupport)
 gem 'json', '2.3.0'
@@ -145,7 +142,6 @@ group :production do
   gem 'unicorn',  '6.1.0'
 end
 
-
 # ----------------------------------------------------- Development and Testing
 group :development do
   # Access an interactive console on exception pages or by calling 'console' anywhere in the code.
@@ -213,13 +209,12 @@ end
 #
 
 # Base framework classes required by other plugins
-gem 'dradis-plugins', '~> 4.5.0'
-
+gem 'dradis-plugins', '~> 4.6.1'
 
 gem 'dradis-api', path: 'engines/dradis-api'
 
 # Import / export project data
-gem 'dradis-projects', '~> 4.5.0'
+gem 'dradis-projects', '~> 4.6.0'
 
 plugins_file = 'Gemfile.plugins'
 if File.exists?(plugins_file)
@@ -230,34 +225,32 @@ end
 # effective.
 
 # ----------------------------------------------------------------- Calculators
-gem 'dradis-calculator_cvss', '~> 4.5.0'
-gem 'dradis-calculator_dread', '~> 4.5.0'
+gem 'dradis-calculator_cvss', '~> 4.6.0'
+gem 'dradis-calculator_dread', '~> 4.6.0'
 
 # ---------------------------------------------------------------------- Export
-gem 'dradis-csv_export', '~> 4.5.0'
-gem 'dradis-html_export', '~> 4.5.0'
-
+gem 'dradis-csv_export', '~> 4.6.0'
+gem 'dradis-html_export', '~> 4.6.0'
 
 # ---------------------------------------------------------------------- Import
-gem 'dradis-csv', '~> 4.5.0'
-
+gem 'dradis-csv', '~> 4.6.0'
 
 # ---------------------------------------------------------------------- Upload
-gem 'dradis-acunetix', '~> 4.5.0'
-gem 'dradis-brakeman', '~> 4.5.0'
-gem 'dradis-burp', '~> 4.5.0'
-gem 'dradis-coreimpact', '~> 4.5.0'
-gem 'dradis-metasploit', '~> 4.5.0'
-gem 'dradis-nessus', '~> 4.5.0'
-gem 'dradis-netsparker', '~> 4.5.0'
-gem 'dradis-nexpose', '~> 4.5.0'
-gem 'dradis-nikto', '~> 4.5.0'
-gem 'dradis-nipper', '~> 4.5.0'
-gem 'dradis-nmap', '~> 4.5.0'
-gem 'dradis-ntospider', '~> 4.5.0'
-gem 'dradis-openvas', '~> 4.5.0'
-gem 'dradis-qualys', '~> 4.5.0'
-gem 'dradis-saint', '~> 4.5.0'
-gem 'dradis-veracode', '~> 4.5.0'
-gem 'dradis-wpscan', '~> 4.5.0'
-gem 'dradis-zap', '~> 4.5.0'
+gem 'dradis-acunetix', '~> 4.6.0'
+gem 'dradis-brakeman', '~> 4.6.0'
+gem 'dradis-burp', '~> 4.6.0'
+gem 'dradis-coreimpact', '~> 4.6.0'
+gem 'dradis-metasploit', '~> 4.6.0'
+gem 'dradis-nessus', '~> 4.6.0'
+gem 'dradis-netsparker', '~> 4.6.0'
+gem 'dradis-nexpose', '~> 4.6.0'
+gem 'dradis-nikto', '~> 4.6.0'
+gem 'dradis-nipper', '~> 4.6.0'
+gem 'dradis-nmap', '~> 4.6.0'
+gem 'dradis-ntospider', '~> 4.6.0'
+gem 'dradis-openvas', '~> 4.6.0'
+gem 'dradis-qualys', '~> 4.6.0'
+gem 'dradis-saint', '~> 4.6.0'
+gem 'dradis-veracode', '~> 4.6.0'
+gem 'dradis-wpscan', '~> 4.6.0'
+gem 'dradis-zap', '~> 4.6.0'