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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Adjusted number fields in tables Detect Merge Conflicts #23143: Pull request #11677 synchronize by littlesvensson
January 27, 2025 18:13 12s
January 27, 2025 18:13 12s
Adjusted number fields in tables Detect Merge Conflicts #23142: Pull request #11677 opened by littlesvensson
January 27, 2025 18:06 9s littlesvensson:numeric-values-alignment-tables
littlesvensson:numeric-values-alignment-tables
January 27, 2025 18:06 9s
feat(gha): Pin and update actions/checkout Detect Merge Conflicts #23141: Pull request #11675 opened by kiblik
January 27, 2025 17:54 10s kiblik:gha_actions_checkout
kiblik:gha_actions_checkout
January 27, 2025 17:54 10s
feat(GHA): Pin azure/setup-helm Detect Merge Conflicts #23140: Pull request #11493 synchronize by kiblik
January 27, 2025 17:51 37s kiblik:gha_pin2
kiblik:gha_pin2
January 27, 2025 17:51 37s
feat(GHA): Pin azure/setup-helm Detect Merge Conflicts #23139: Pull request #11493 synchronize by kiblik
January 27, 2025 17:51 32s
January 27, 2025 17:51 32s
feat(gha): Update and pin "peter-evans/create-pull-request" Detect Merge Conflicts #23138: Pull request #11674 opened by kiblik
January 27, 2025 17:45 19s kiblik:pin_peter-evans_create-pull-request
kiblik:pin_peter-evans_create-pull-request
January 27, 2025 17:45 19s
Support builds for different architectures including arm64 Detect Merge Conflicts #23137: Pull request #11673 opened by valentijnscholten
January 27, 2025 17:42 12s valentijnscholten:multi-arch-builds
valentijnscholten:multi-arch-builds
January 27, 2025 17:42 12s
Ruff: Add and fix N999 Detect Merge Conflicts #23136: Pull request #11647 synchronize by kiblik
January 27, 2025 17:40 9s kiblik:ruff_N999
kiblik:ruff_N999
January 27, 2025 17:40 9s
Ruff: Add and fix N999 Detect Merge Conflicts #23135: Pull request #11647 synchronize by kiblik
January 27, 2025 17:40 10s
January 27, 2025 17:40 10s
make alpine builds work with docker compose Detect Merge Conflicts #23134: Pull request #11669 synchronize by valentijnscholten
January 27, 2025 17:23 12s valentijnscholten-patch-1
valentijnscholten-patch-1
January 27, 2025 17:23 12s
make alpine builds work with docker compose Detect Merge Conflicts #23133: Pull request #11669 synchronize by valentijnscholten
January 27, 2025 17:23 13s
January 27, 2025 17:23 13s
chore(deps): update peter-evans/create-pull-request action from v5 to v7 (.github/workflows/update-sample-data.yml) Detect Merge Conflicts #23132: Pull request #11672 opened by renovate bot
January 27, 2025 17:20 2m 15s renovate/peter-evans-create-pull-request-7.x
renovate/peter-evans-create-pull-request-7.x
January 27, 2025 17:20 2m 15s
chore(deps): update actions/checkout action from v3 to v4 (.github/workflows/update-sample-data.yml) Detect Merge Conflicts #23131: Pull request #11671 opened by renovate bot
January 27, 2025 17:20 2m 17s renovate/actions-checkout-4.x
renovate/actions-checkout-4.x
January 27, 2025 17:20 2m 17s
NodeJS: Correct Debian bullseye reference Detect Merge Conflicts #23130: Pull request #11670 opened by valentijnscholten
January 27, 2025 17:12 10s valentijnscholten-patch-2
valentijnscholten-patch-2
January 27, 2025 17:12 10s
Release: Merge back 2.42.3 into dev from: master-into-dev/2.42.3-2.43.0-dev Detect Merge Conflicts #23129: Pull request #11667 synchronize by rossops
January 27, 2025 17:02 12s master-into-dev/2.42.3-2.43.0-dev
master-into-dev/2.42.3-2.43.0-dev
January 27, 2025 17:02 12s
Release: Merge back 2.42.3 into dev from: master-into-dev/2.42.3-2.43.0-dev Detect Merge Conflicts #23128: Pull request #11667 synchronize by rossops
January 27, 2025 17:02 10s
January 27, 2025 17:02 10s
make alpine builds work with docker compose Detect Merge Conflicts #23127: Pull request #11669 opened by valentijnscholten
January 27, 2025 16:59 2m 11s valentijnscholten-patch-1
valentijnscholten-patch-1
January 27, 2025 16:59 2m 11s
Release: Merge back 2.42.3 into dev from: master-into-dev/2.42.3-2.43.0-dev Detect Merge Conflicts #23126: Pull request #11667 synchronize by rossops
January 27, 2025 16:46 12s master-into-dev/2.42.3-2.43.0-dev
master-into-dev/2.42.3-2.43.0-dev
January 27, 2025 16:46 12s
Release: Merge back 2.42.3 into dev from: master-into-dev/2.42.3-2.43.0-dev Detect Merge Conflicts #23125: Pull request #11667 synchronize by rossops
January 27, 2025 16:46 13s
January 27, 2025 16:46 13s
Release: Merge back 2.42.3 into bugfix from: master-into-bugfix/2.42.3-2.43.0-dev Detect Merge Conflicts #23124: Pull request #11666 reopened by rossops
January 27, 2025 16:37 15s master-into-bugfix/2.42.3-2.43.0-dev
master-into-bugfix/2.42.3-2.43.0-dev
January 27, 2025 16:37 15s
🎉 add MGASA vulnid Detect Merge Conflicts #23123: Pull request #11668 opened by manuel-sommer
January 27, 2025 16:08 14s manuel-sommer:add_mgasa
manuel-sommer:add_mgasa
January 27, 2025 16:08 14s
Add different pro banner for databases over 100k findings and endpoints Detect Merge Conflicts #23122: Pull request #11665 opened by Maffooch
January 27, 2025 15:53 2m 13s Maffooch:pro
Maffooch:pro
January 27, 2025 15:53 2m 13s
Release: Merge release into master from: release/2.42.3 Detect Merge Conflicts #23121: Pull request #11664 synchronize by rossops
January 27, 2025 15:29 15s release/2.42.3
release/2.42.3
January 27, 2025 15:29 15s
Release: Merge release into master from: release/2.42.3 Detect Merge Conflicts #23120: Pull request #11664 synchronize by rossops
January 27, 2025 15:28 16s
January 27, 2025 15:28 16s
Django AuditLog: Upgrade to 3.x Detect Merge Conflicts #23119: Pull request #11592 synchronize by Maffooch
January 27, 2025 15:25 11s Maffooch:audit-log
Maffooch:audit-log
January 27, 2025 15:25 11s