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
10,169 workflow runs
10,169 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Release: Merge release into master from: release/2.42.2 Detect Merge Conflicts #22928: Pull request #11605 synchronize by rossops
January 21, 2025 15:26 10s
January 21, 2025 15:26 10s
chore(deps): update dependency vite from 6.0.10 to v6.0.11 (docs/package.json) Detect Merge Conflicts #22927: Pull request #11604 opened by renovate bot
January 21, 2025 10:47 2m 12s renovate/vite-6.x-lockfile
renovate/vite-6.x-lockfile
January 21, 2025 10:47 2m 12s
Mend SCA Parser update Detect Merge Conflicts #22926: Pull request #11395 synchronize by testaccount90009
January 20, 2025 21:47 11s testaccount90009:dev
testaccount90009:dev
January 20, 2025 21:47 11s
Mend SCA Parser update Detect Merge Conflicts #22925: Pull request #11395 synchronize by testaccount90009
January 20, 2025 21:47 11s
January 20, 2025 21:47 11s
Update dependency vite from 6.0.7 to v6.0.10 (docs/package.json) Detect Merge Conflicts #22924: Pull request #11598 synchronize by renovate bot
January 20, 2025 20:35 2m 15s
January 20, 2025 20:35 2m 15s
Update dependency vite from 6.0.7 to v6.0.10 (docs/package.json) Detect Merge Conflicts #22923: Pull request #11598 synchronize by renovate bot
January 20, 2025 20:35 2m 15s renovate/vite-6.x-lockfile
renovate/vite-6.x-lockfile
January 20, 2025 20:35 2m 15s
Update helm/chart-testing-action action from v2.6.1 to v2.7.0 (.github/workflows/test-helm-chart.yml) Detect Merge Conflicts #22922: Pull request #11601 opened by renovate bot
January 20, 2025 12:31 9s renovate/helm-chart-testing-action-2.x
renovate/helm-chart-testing-action-2.x
January 20, 2025 12:31 9s
Update dependency vite from 6.0.7 to v6.0.10 (docs/package.json) Detect Merge Conflicts #22921: Pull request #11598 synchronize by renovate bot
January 20, 2025 12:31 9s renovate/vite-6.x-lockfile
renovate/vite-6.x-lockfile
January 20, 2025 12:31 9s
Update dependency vite from 6.0.7 to v6.0.10 (docs/package.json) Detect Merge Conflicts #22920: Pull request #11598 synchronize by renovate bot
January 20, 2025 12:31 10s
January 20, 2025 12:31 10s
Bump boto3 from 1.36.0 to 1.36.2 Detect Merge Conflicts #22919: Pull request #11600 opened by dependabot bot
January 20, 2025 12:30 10s dependabot/pip/dev/boto3-1.36.2
dependabot/pip/dev/boto3-1.36.2
January 20, 2025 12:30 10s
Bump asteval from 1.0.5 to 1.0.6 Detect Merge Conflicts #22918: Pull request #11599 opened by dependabot bot
January 20, 2025 12:30 11s dependabot/pip/dev/asteval-1.0.6
dependabot/pip/dev/asteval-1.0.6
January 20, 2025 12:30 11s
Update dependency vite from 6.0.7 to v6.0.10 (docs/package.json) Detect Merge Conflicts #22917: Pull request #11598 opened by renovate bot
January 20, 2025 08:31 12s renovate/vite-6.x-lockfile
renovate/vite-6.x-lockfile
January 20, 2025 08:31 12s
Update Anchore Engine to Anchore Enterprise: New Parser for Enterpris… Detect Merge Conflicts #22916: Pull request #11597 opened by Sopuru
January 19, 2025 22:49 11s Sopuru:update-anchore-engine
Sopuru:update-anchore-engine
January 19, 2025 22:49 11s
Update release-drafter/release-drafter action from v6.0.0 to v6.1.0 (.github/workflows/release-drafter.yml) Detect Merge Conflicts #22915: Pull request #11596 opened by renovate bot
January 19, 2025 16:59 10s renovate/release-drafter-release-drafter-6.x
renovate/release-drafter-release-drafter-6.x
January 19, 2025 16:59 10s
Mend SCA Parser update Detect Merge Conflicts #22914: Pull request #11395 synchronize by testaccount90009
January 18, 2025 20:11 15s testaccount90009:dev
testaccount90009:dev
January 18, 2025 20:11 15s
Mend SCA Parser update Detect Merge Conflicts #22913: Pull request #11395 synchronize by testaccount90009
January 18, 2025 20:11 12s
January 18, 2025 20:11 12s
Django AuditLog: Upgrade to 3.x Detect Merge Conflicts #22912: Pull request #11592 synchronize by Maffooch
January 17, 2025 23:33 10s Maffooch:audit-log
Maffooch:audit-log
January 17, 2025 23:33 10s
Django AuditLog: Upgrade to 3.x Detect Merge Conflicts #22911: Pull request #11592 synchronize by Maffooch
January 17, 2025 23:33 9s
January 17, 2025 23:33 9s
Django AuditLog: Upgrade to 3.x Detect Merge Conflicts #22910: Pull request #11592 synchronize by Maffooch
January 17, 2025 23:22 9s Maffooch:audit-log
Maffooch:audit-log
January 17, 2025 23:22 9s
Django AuditLog: Upgrade to 3.x Detect Merge Conflicts #22909: Pull request #11592 synchronize by Maffooch
January 17, 2025 23:22 12s
January 17, 2025 23:22 12s
Django AuditLog: Upgrade to 3.x Detect Merge Conflicts #22908: Pull request #11592 synchronize by Maffooch
January 17, 2025 23:21 12s Maffooch:audit-log
Maffooch:audit-log
January 17, 2025 23:21 12s
Django AuditLog: Upgrade to 3.x Detect Merge Conflicts #22907: Pull request #11592 synchronize by Maffooch
January 17, 2025 23:21 15s
January 17, 2025 23:21 15s
View Alerts: Sanitize and mark safe Detect Merge Conflicts #22906: Pull request #11594 opened by Maffooch
January 17, 2025 20:33 10s Maffooch:alerts-encoding
Maffooch:alerts-encoding
January 17, 2025 20:33 10s
Add GHA updater for keep sample data at a reasonable date Detect Merge Conflicts #22905: Pull request #11593 synchronize by Maffooch
January 17, 2025 17:35 11s Maffooch:fixtures
Maffooch:fixtures
January 17, 2025 17:35 11s
Add GHA updater for keep sample data at a reasonable date Detect Merge Conflicts #22904: Pull request #11593 synchronize by Maffooch
January 17, 2025 17:35 14s
January 17, 2025 17:35 14s