Merge pull request DefectDojo#8390 from DefectDojo/release/2.24.2

Release: Merge release into master from: release/2.24.2

components/package.json

@@ -1,6 +1,6 @@
 {
   "name": "defectdojo",
-  "version": "2.24.1",
+  "version": "2.24.2",
   "license" : "BSD-3-Clause",
   "private": true,
   "dependencies": {

docs/content/en/integrations/parsers/api/_index.md

@@ -4,18 +4,18 @@ description: "Report pulled to DefectDojo via API exposed by scanning service"
 weight: 2
 chapter: true
 ---
-All parsers which using API have common basic configuration step but with different values.
+All parsers that use API pull have common basic configuration steps, but with different values.
 
-Follow these steps to setup API importing:
+Follow these steps to set up API importing:
 
 1.  Configure the API authentication details by navigating to
     `Configuration -> Tool Configuration -> Add Tool Configuration`. Enter a `Name`,
-    selecting related `Tool Type` and `Authentication Type` "API Key". Paste your credentials to field
-    and other fields based on definitions below.
+    selecting the related `Tool Type` and `Authentication Type` "API Key". Paste your credentials
+    to the proper fields based on definitions below.
 
 2.  In the `Product` settings select `Add API Scan Configuration` and select the
-    previously added `Tool Configuration`. Proved values based on definitions below
+    previously added `Tool Configuration`. Provide values based on definitions below.
 
 3.  After this is done, you can import the findings on the `Product` page through
-    `Findings -> Import Scan Results`. Select "Edgescan Scan" as the `Scan type`,
-    the API scan configuration from the last step, and click `Import`.
+    `Findings -> Import Scan Results`. As the `Scan type`, select the related type,
+    the API scan configuration from the last step, and click `Import`.

dojo/__init__.py

@@ -4,6 +4,6 @@
 # Django starts so that shared_task will use this app.
 from .celery import app as celery_app  # noqa
 
-__version__ = '2.24.1'
+__version__ = '2.24.2'
 __url__ = 'https://github.com/DefectDojo/django-DefectDojo'
 __docs__ = 'https://documentation.defectdojo.com'

dojo/static/dojo/css/dojo.css

@@ -126,6 +126,11 @@ a:hover {
   text-decoration: none;
 }
 
+.nav.nav-second-level.nav-up {
+    transform: translateY(-100%);
+    margin-top: 41px;
+}
+
 .nav-tabs {
     border-bottom: 1px solid rgb(148, 168, 187);
 }

dojo/templates/base.html

@@ -492,7 +492,7 @@
                                                 <i class="fa-solid fa-gear fa-fw"></i>
                                                 <span>{% trans "Configuration" %}</span>
                                             </a>
-                                            <ul class="nav nav-second-level">
+                                            <ul class="nav nav-second-level nav-up">
                                                 {% if "dojo.change_announcement"|has_configuration_permission:request %}
                                                     <li>
                                                         <a href="{% url 'configure_announcement' %}">

helm/defectdojo/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: "2.24.1"
+appVersion: "2.24.2"
 description: A Helm chart for Kubernetes to install DefectDojo
 name: defectdojo
-version: 1.6.75
+version: 1.6.76
 icon: https://www.defectdojo.org/img/favicon.ico
 maintainers:
   - name: madchap