Merge branch 'DefectDojo:master' into wizcli-improvements

Author: OsamaMahmood

.github/pr-reminder.py

@@ -1,37 +1,19 @@
-name: Notify Pending PR Reviewers
+name: Daily PR Review Reminder
 
 on:
-  workflow_dispatch:
   schedule:
-    - cron: '0 16 * * 1-5'  # 11:00 AM CT M-F
+    - cron: "0 16 * * 1-5" # 11:00 AM CT M-F
+  workflow_dispatch:
 
 jobs:
   notify-reviewers:
     runs-on: ubuntu-latest
     if: github.repository == 'DefectDojo/django-DefectDojo' # Notify only in core repo, not in forks - it would just fail in fork
-
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
+      - name: Notify reviewers in Slack
+        uses: DefectDojo-Inc/notify-pr-reviewers-action@master
         with:
-          # Only checkout the master branch to avoid changes to this script
-          # This is to reduce the possibilities of a secret leak from modifying
-          # this action, or the python script that is called down below
-          ref: master 
-
-      - name: Set up Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.13"
-
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install requests
-
-      - name: Run PR reminder script
-        env:
-          GH_TOKEN: ${{ secrets.GH_TOKEN }}
-          SLACK_TOKEN: ${{ secrets.SLACK_TOKEN }}
-        run: |
-          python3 .github/pr-reminder.py
+          owner: "DefectDojo"
+          repository: "django-DefectDojo"
+          gh_token: ${{ secrets.GH_TOKEN }}
+          slack_token: ${{ secrets.SLACK_TOKEN }}

.github/workflows/slack-pr-reminder.yml

@@ -41,6 +41,7 @@ pip-delete-this-directory.txt
 .ruff_cache
 nosetests.xml
 coverage.xml
+selenium_page_source.html
 
 # Translations
 *.mo

.gitignore

@@ -129,7 +129,6 @@ Core Moderators can help you with pull requests or feedback on dev ideas:
 
 Moderators can help you with pull requests or feedback on dev ideas:
 * Charles Neill ([@cneill](https://github.com/cneill) | [@ccneill](https://twitter.com/ccneill))
-* Jay Paz ([@jjpaz](https://twitter.com/jjpaz))
 * Blake Owens ([@blakeaowens](https://github.com/blakeaowens))
 
 ## Hall of Fame

README.md

@@ -1,6 +1,6 @@
 {
   "name": "defectdojo",
-  "version": "2.47.0-dev",
+  "version": "2.46.4",
   "license" : "BSD-3-Clause",
   "private": true,
   "dependencies": {

components/package.json

@@ -26,7 +26,7 @@ echo "Creating Announcement Banner"
 cat <<EOD | python3 manage.py shell
 from dojo.models import Announcement, UserAnnouncement, Dojo_User
 announcement, created = Announcement.objects.get_or_create(id=1)
-announcement.message = '<a href="https://defectdojo.com/contact" target="_blank">Cloud and On-Premise Subscriptions Now Available! Click here for more details</a>'
+announcement.message = '<a href="https://cloud.defectdojo.com/accounts/onboarding/plg_step_1" target="_blank">DefectDojo Pro Cloud and On-Premise Subscriptions Now Available! Create an account to try Pro for free!</a>'
 announcement.dismissable = True
 announcement.save()
 for dojo_user in Dojo_User.objects.all():