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,779 workflow run results
8,779 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Bump django from 5.0.8 to 5.0.9 Detect Merge Conflicts #20811: Pull request #11023 synchronize by dependabot bot
October 9, 2024 22:28 2m 11s
October 9, 2024 22:28 2m 11s
Bump django from 5.0.8 to 5.1.2 Detect Merge Conflicts #20810: Pull request #11025 synchronize by dependabot bot
October 9, 2024 21:35 2m 11s dependabot/pip/dev/django-5.1.2
dependabot/pip/dev/django-5.1.2
October 9, 2024 21:35 2m 11s
Bump django from 5.0.8 to 5.1.2 Detect Merge Conflicts #20809: Pull request #11025 synchronize by dependabot bot
October 9, 2024 21:35 2m 16s
October 9, 2024 21:35 2m 16s
AWS Security Hub: Accommodate for reports with missing AccountID Detect Merge Conflicts #20808: Pull request #11034 opened by Maffooch
October 9, 2024 20:59 11s Maffooch:aws
Maffooch:aws
October 9, 2024 20:59 11s
Downgrade uwsgi to 2.0.26 Detect Merge Conflicts #20807: Pull request #11033 opened by Maffooch
October 9, 2024 20:48 12s Maffooch-patch-1
Maffooch-patch-1
October 9, 2024 20:48 12s
Bump pdfmake from 0.2.13 to 0.2.14 in /components Detect Merge Conflicts #20805: Pull request #11028 opened by dependabot bot
October 9, 2024 12:58 13s dependabot/npm_and_yarn/components/dev/pdfmake-0.2.14
dependabot/npm_and_yarn/components/dev/pdfmake-0.2.14
October 9, 2024 12:58 13s
chore(deps): update helm release redis from 19.6.4 to v20 (helm/defectdojo/chart.yaml) Detect Merge Conflicts #20804: Pull request #10736 synchronize by renovate bot
October 9, 2024 12:06 12s renovate/redis-20.x
renovate/redis-20.x
October 9, 2024 12:06 12s
chore(deps): update helm release redis from 19.6.4 to v20 (helm/defectdojo/chart.yaml) Detect Merge Conflicts #20803: Pull request #10736 synchronize by renovate bot
October 9, 2024 12:06 13s
October 9, 2024 12:06 13s
Bump python-gitlab from 4.12.2 to 4.13.0 Detect Merge Conflicts #20802: Pull request #11027 opened by dependabot bot
October 9, 2024 12:05 10s dependabot/pip/dev/python-gitlab-4.13.0
dependabot/pip/dev/python-gitlab-4.13.0
October 9, 2024 12:05 10s
Bump boto3 from 1.35.35 to 1.35.36 Detect Merge Conflicts #20801: Pull request #11026 opened by dependabot bot
October 9, 2024 12:05 12s dependabot/pip/dev/boto3-1.35.36
dependabot/pip/dev/boto3-1.35.36
October 9, 2024 12:05 12s
Bump django from 5.0.8 to 5.1.2 Detect Merge Conflicts #20800: Pull request #11025 opened by dependabot bot
October 9, 2024 12:05 2m 13s dependabot/pip/dev/django-5.1.2
dependabot/pip/dev/django-5.1.2
October 9, 2024 12:05 2m 13s
Mend SCA imports contain locations which are similar to filePaths for SAST scans Detect Merge Conflicts #20798: Pull request #11001 synchronize by testaccount90009
October 8, 2024 23:24 2m 11s testaccount90009:update-mend-parser
testaccount90009:update-mend-parser
October 8, 2024 23:24 2m 11s
Mend SCA imports contain locations which are similar to filePaths for SAST scans Detect Merge Conflicts #20797: Pull request #11001 synchronize by testaccount90009
October 8, 2024 23:24 2m 14s
October 8, 2024 23:24 2m 14s
Bump django from 5.0.8 to 5.0.9 Detect Merge Conflicts #20796: Pull request #11023 opened by dependabot bot
October 8, 2024 21:35 15s dependabot/pip/django-5.0.9
dependabot/pip/django-5.0.9
October 8, 2024 21:35 15s
Ruff: add and fix some SIM rules Detect Merge Conflicts #20795: Pull request #10926 synchronize by kiblik
October 8, 2024 12:58 11s kiblik:ruff_sim
kiblik:ruff_sim
October 8, 2024 12:58 11s
Ruff: add and fix some SIM rules Detect Merge Conflicts #20794: Pull request #10926 synchronize by kiblik
October 8, 2024 12:58 11s
October 8, 2024 12:58 11s
Bump vcrpy from 6.0.1 to 6.0.2 Detect Merge Conflicts #20793: Pull request #11022 opened by dependabot bot
October 8, 2024 12:56 56s dependabot/pip/dev/vcrpy-6.0.2
dependabot/pip/dev/vcrpy-6.0.2
October 8, 2024 12:56 56s
Bump boto3 from 1.35.34 to 1.35.35 Detect Merge Conflicts #20792: Pull request #11021 opened by dependabot bot
October 8, 2024 12:56 15s dependabot/pip/dev/boto3-1.35.35
dependabot/pip/dev/boto3-1.35.35
October 8, 2024 12:56 15s
Ruff: Fix issues via "target-version" Detect Merge Conflicts #20790: Pull request #10846 synchronize by kiblik
October 8, 2024 12:51 12s
October 8, 2024 12:51 12s
Ruff: Fix issues via "target-version" Detect Merge Conflicts #20791: Pull request #10846 synchronize by kiblik
October 8, 2024 12:51 13s kiblik:ruff_target-version
kiblik:ruff_target-version
October 8, 2024 12:51 13s
chore(deps): update redis docker tag from 7.2.5 to v7.4.1 (docker-compose.yml) Detect Merge Conflicts #20789: Pull request #10651 synchronize by renovate bot
October 8, 2024 00:57 12s renovate/redis-7.x
renovate/redis-7.x
October 8, 2024 00:57 12s
chore(deps): update redis docker tag from 7.2.5 to v7.4.1 (docker-compose.yml) Detect Merge Conflicts #20788: Pull request #10651 synchronize by renovate bot
October 8, 2024 00:57 11s
October 8, 2024 00:57 11s
chore(deps): update redis docker tag from 7.2.5 to v7.4.1 (docker-compose.yml) Detect Merge Conflicts #20787: Pull request #10651 synchronize by renovate bot
October 7, 2024 21:46 12s
October 7, 2024 21:46 12s
chore(deps): update redis docker tag from 7.2.5 to v7.4.1 (docker-compose.yml) Detect Merge Conflicts #20786: Pull request #10651 synchronize by renovate bot
October 7, 2024 21:46 12s renovate/redis-7.x
renovate/redis-7.x
October 7, 2024 21:46 12s
Add product_scm_type field processing in auto_create_context for import-scan Detect Merge Conflicts #20785: Pull request #11018 synchronize by dmarushkin
October 7, 2024 20:17 12s dmarushkin:master
dmarushkin:master
October 7, 2024 20:17 12s