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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

appcheck-severity-determination-fix Use v4, v3, v2 cvss vectors for severity Detect Merge Conflicts #20492: Pull request #10918 opened by dogboat
September 16, 2024 16:09 11s dogboat:appcheck-severity-determination-fix
dogboat:appcheck-severity-determination-fix
September 16, 2024 16:09 11s
Fix metrics aggregation Detect Merge Conflicts #20491: Pull request #10917 synchronize by dogboat
September 16, 2024 15:40 14s dogboat:metrics-aggregate-fix
dogboat:metrics-aggregate-fix
September 16, 2024 15:40 14s
Fix metrics aggregation Detect Merge Conflicts #20490: Pull request #10917 synchronize by dogboat
September 16, 2024 15:40 11s
September 16, 2024 15:40 11s
Fix metrics aggregation Detect Merge Conflicts #20489: Pull request #10917 opened by dogboat
September 16, 2024 15:23 11s dogboat:metrics-aggregate-fix
dogboat:metrics-aggregate-fix
September 16, 2024 15:23 11s
fix(docker compose): Use 'docker compose' everywhere Detect Merge Conflicts #20488: Pull request #10916 reopened by kiblik
September 16, 2024 15:08 13s kiblik:docker_compose_typo
kiblik:docker_compose_typo
September 16, 2024 15:08 13s
fix(docker compose): Use 'docker compose' everywhere Detect Merge Conflicts #20487: Pull request #10916 reopened by kiblik
September 16, 2024 13:04 10s kiblik:docker_compose_typo
kiblik:docker_compose_typo
September 16, 2024 13:04 10s
fix(docker compose): Use 'docker compose' everywhere Detect Merge Conflicts #20486: Pull request #10916 reopened by kiblik
September 16, 2024 12:46 15s kiblik:docker_compose_typo
kiblik:docker_compose_typo
September 16, 2024 12:46 15s
fix(docker compose): Use 'docker compose' everywhere Detect Merge Conflicts #20485: Pull request #10916 opened by kiblik
September 16, 2024 12:42 10s kiblik:docker_compose_typo
kiblik:docker_compose_typo
September 16, 2024 12:42 10s
Bump python from 3.11.9-slim-bookworm to 3.12.6-slim-bookworm Detect Merge Conflicts #20484: Pull request #10915 opened by dependabot bot
September 16, 2024 12:18 19s dependabot/docker/dev/python-3.12.6-slim-bookworm
dependabot/docker/dev/python-3.12.6-slim-bookworm
September 16, 2024 12:18 19s
Bump boto3 from 1.35.18 to 1.35.19 Detect Merge Conflicts #20483: Pull request #10914 opened by dependabot bot
September 16, 2024 12:15 11s dependabot/pip/dev/boto3-1.35.19
dependabot/pip/dev/boto3-1.35.19
September 16, 2024 12:15 11s
Bump pyyaml from 6.0.1 to 6.0.2 Detect Merge Conflicts #20482: Pull request #10913 opened by dependabot bot
September 16, 2024 12:15 14s dependabot/pip/dev/pyyaml-6.0.2
dependabot/pip/dev/pyyaml-6.0.2
September 16, 2024 12:15 14s
Bump python-gitlab from 4.10.0 to 4.11.1 Detect Merge Conflicts #20481: Pull request #10912 opened by dependabot bot
September 16, 2024 12:15 16s dependabot/pip/dev/python-gitlab-4.11.1
dependabot/pip/dev/python-gitlab-4.11.1
September 16, 2024 12:15 16s
Bump asteval from 1.0.3 to 1.0.4 Detect Merge Conflicts #20480: Pull request #10911 opened by dependabot bot
September 16, 2024 12:15 19s dependabot/pip/dev/asteval-1.0.4
dependabot/pip/dev/asteval-1.0.4
September 16, 2024 12:15 19s
Bump psycopg[c] from 3.2.1 to 3.2.2 Detect Merge Conflicts #20479: Pull request #10910 opened by dependabot bot
September 16, 2024 12:15 17s dependabot/pip/dev/psycopg-c--3.2.2
dependabot/pip/dev/psycopg-c--3.2.2
September 16, 2024 12:15 17s
Bump ruff from 0.6.4 to 0.6.5 Detect Merge Conflicts #20478: Pull request #10909 opened by dependabot bot
September 16, 2024 12:15 12s dependabot/pip/dev/ruff-0.6.5
dependabot/pip/dev/ruff-0.6.5
September 16, 2024 12:15 12s
Ruff: Add ruff PLR0915 Detect Merge Conflicts #20477: Pull request #10893 synchronize by Maffooch
September 16, 2024 02:40 2m 13s kiblik:ruff_PLR0915
kiblik:ruff_PLR0915
September 16, 2024 02:40 2m 13s
Ruff: Add ruff PLR0915 Detect Merge Conflicts #20476: Pull request #10893 synchronize by Maffooch
September 16, 2024 02:40 2m 13s
September 16, 2024 02:40 2m 13s
Wiz Parser: Add SCA parser and fortify old format Detect Merge Conflicts #20475: Pull request #10905 synchronize by Maffooch
September 16, 2024 02:23 14s Maffooch:wiz
Maffooch:wiz
September 16, 2024 02:23 14s
Wiz Parser: Add SCA parser and fortify old format Detect Merge Conflicts #20474: Pull request #10905 synchronize by Maffooch
September 16, 2024 02:23 11s
September 16, 2024 02:23 11s
Wiz Parser: Add SCA parser and fortify old format Detect Merge Conflicts #20473: Pull request #10905 synchronize by Maffooch
September 16, 2024 02:22 10s
September 16, 2024 02:22 10s
Wiz Parser: Add SCA parser and fortify old format Detect Merge Conflicts #20472: Pull request #10905 synchronize by Maffooch
September 16, 2024 02:19 2m 19s
September 16, 2024 02:19 2m 19s
Feature: Checkmarx Cxflow SAST parser Detect Merge Conflicts #20471: Pull request #9719 synchronize by biennd279
September 14, 2024 16:38 14s
September 14, 2024 16:38 14s
Feature: Checkmarx Cxflow SAST parser Detect Merge Conflicts #20470: Pull request #9719 synchronize by biennd279
September 14, 2024 16:38 11s biennd279:feature-checkmarx-cxflow-sast
biennd279:feature-checkmarx-cxflow-sast
September 14, 2024 16:38 11s
Update dependency postcss from 8.4.45 to v8.4.47 (docs/package.json) Detect Merge Conflicts #20469: Pull request #10908 opened by renovate bot
September 14, 2024 16:22 9s renovate/postcss-8.x
renovate/postcss-8.x
September 14, 2024 16:22 9s
Feature: Checkmarx Cxflow SAST parser Detect Merge Conflicts #20468: Pull request #9719 synchronize by biennd279
September 14, 2024 14:04 9s biennd279:feature-checkmarx-cxflow-sast
biennd279:feature-checkmarx-cxflow-sast
September 14, 2024 14:04 9s