Skip to content

Actions: DefectDojo/django-DefectDojo

Actions

Detect Merge Conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
detect-merge-conflicts.yaml
8,185 workflow runs
8,185 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

fix(deps): update dependency thulite from 2.5.0 to v2.6.3 (docs/package.json) Detect Merge Conflicts #26741: Pull request #12833 synchronize by renovate bot
July 24, 2025 16:24 7s renovate/thulite-2.x
renovate/thulite-2.x
July 24, 2025 16:24 7s
fix(deps): update dependency thulite from 2.5.0 to v2.6.3 (docs/package.json) Detect Merge Conflicts #26740: Pull request #12833 synchronize by renovate bot
July 24, 2025 16:24 7s
July 24, 2025 16:24 7s
fix(deps): update dependency @thulite/doks-core from 1.8.0 to v1.8.3 (docs/package.json) Detect Merge Conflicts #26739: Pull request #12855 opened by renovate bot
July 24, 2025 16:24 2m 7s renovate/thulite-doks-core-1.8.x
renovate/thulite-doks-core-1.8.x
July 24, 2025 16:24 2m 7s
feat: improve Helm chart Detect Merge Conflicts #26738: Pull request #12691 synchronize by fernandezcuesta
July 24, 2025 12:49 Action required fernandezcuesta:feat/improve-helm-chart
fernandezcuesta:feat/improve-helm-chart
July 24, 2025 12:49 Action required
feat: improve Helm chart Detect Merge Conflicts #26737: Pull request #12691 synchronize by fernandezcuesta
July 24, 2025 12:49 6s
July 24, 2025 12:49 6s
🎉 Add Sophos vulnid Detect Merge Conflicts #26736: Pull request #12852 reopened by manuel-sommer
July 24, 2025 12:19 9s manuel-sommer:sophos_vulnid
manuel-sommer:sophos_vulnid
July 24, 2025 12:19 9s
Bump boto3 from 1.39.11 to 1.39.12 Detect Merge Conflicts #26735: Pull request #12854 opened by dependabot bot
July 24, 2025 12:02 6s dependabot/pip/dev/boto3-1.39.12
dependabot/pip/dev/boto3-1.39.12
July 24, 2025 12:02 6s
Bump gitpython from 3.1.44 to 3.1.45 Detect Merge Conflicts #26734: Pull request #12853 opened by dependabot bot
July 24, 2025 12:02 8s dependabot/pip/dev/gitpython-3.1.45
dependabot/pip/dev/gitpython-3.1.45
July 24, 2025 12:02 8s
🎉 Add Sophos vulnid Detect Merge Conflicts #26733: Pull request #12852 opened by manuel-sommer
July 24, 2025 09:48 8s manuel-sommer:sophos_vulnid
manuel-sommer:sophos_vulnid
July 24, 2025 09:48 8s
🎉 Add Xeol parser #12816 Detect Merge Conflicts #26732: Pull request #12846 synchronize by manuel-sommer
July 24, 2025 08:44 7s manuel-sommer:xeol_parser
manuel-sommer:xeol_parser
July 24, 2025 08:44 7s
🎉 Add Xeol parser #12816 Detect Merge Conflicts #26731: Pull request #12846 synchronize by manuel-sommer
July 24, 2025 08:44 6s
July 24, 2025 08:44 6s
chore(deps): update dependency vite from 7.0.5 to v7.0.6 (docs/package.json) Detect Merge Conflicts #26730: Pull request #12850 opened by renovate bot
July 24, 2025 07:14 6s renovate/vite-7.0.x
renovate/vite-7.0.x
July 24, 2025 07:14 6s
🎉 Add Xeol parser #12816 Detect Merge Conflicts #26729: Pull request #12846 synchronize by manuel-sommer
July 24, 2025 07:02 1m 52s manuel-sommer:xeol_parser
manuel-sommer:xeol_parser
July 24, 2025 07:02 1m 52s
🎉 Add Xeol parser #12816 Detect Merge Conflicts #26728: Pull request #12846 synchronize by manuel-sommer
July 24, 2025 07:02 1m 55s
July 24, 2025 07:02 1m 55s
🎉 Add Xeol parser #12816 Detect Merge Conflicts #26727: Pull request #12846 synchronize by manuel-sommer
July 24, 2025 06:57 9s manuel-sommer:xeol_parser
manuel-sommer:xeol_parser
July 24, 2025 06:57 9s
🎉 Add Xeol parser #12816 Detect Merge Conflicts #26726: Pull request #12846 synchronize by manuel-sommer
July 24, 2025 06:57 2m 7s
July 24, 2025 06:57 2m 7s
chore(deps): update helm release redis from 19.6.4 to v21 (helm/defectdojo/chart.yaml) Detect Merge Conflicts #26725: Pull request #12393 synchronize by renovate bot
July 23, 2025 15:01 9s renovate/redis-21.x
renovate/redis-21.x
July 23, 2025 15:01 9s
chore(deps): update helm release redis from 19.6.4 to v21 (helm/defectdojo/chart.yaml) Detect Merge Conflicts #26724: Pull request #12393 synchronize by renovate bot
July 23, 2025 15:01 11s
July 23, 2025 15:01 11s
fix(deps): update dependency thulite from 2.5.0 to v2.6.3 (docs/package.json) Detect Merge Conflicts #26723: Pull request #12833 synchronize by renovate bot
July 23, 2025 15:01 2m 9s renovate/thulite-2.x
renovate/thulite-2.x
July 23, 2025 15:01 2m 9s
fix(deps): update dependency thulite from 2.5.0 to v2.6.3 (docs/package.json) Detect Merge Conflicts #26722: Pull request #12833 synchronize by renovate bot
July 23, 2025 15:01 2m 10s
July 23, 2025 15:01 2m 10s
semgrep pro paser Detect Merge Conflicts #26721: Pull request #12848 synchronize by valentijnscholten
July 23, 2025 14:34 9s valentijnscholten:semgrep_pro
valentijnscholten:semgrep_pro
July 23, 2025 14:34 9s
semgrep pro paser Detect Merge Conflicts #26720: Pull request #12848 synchronize by valentijnscholten
July 23, 2025 14:34 6s
July 23, 2025 14:34 6s
semgrep pro paser Detect Merge Conflicts #26719: Pull request #12848 opened by valentijnscholten
July 23, 2025 14:33 8s valentijnscholten:semgrep_pro
valentijnscholten:semgrep_pro
July 23, 2025 14:33 8s
fix(deps): update dependency thulite from 2.5.0 to v2.6.3 (docs/package.json) Detect Merge Conflicts #26718: Pull request #12833 synchronize by renovate bot
July 23, 2025 12:15 6s renovate/thulite-2.x
renovate/thulite-2.x
July 23, 2025 12:15 6s
fix(deps): update dependency thulite from 2.5.0 to v2.6.3 (docs/package.json) Detect Merge Conflicts #26717: Pull request #12833 synchronize by renovate bot
July 23, 2025 12:15 7s
July 23, 2025 12:15 7s