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
9,293 workflow run results
9,293 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

feat(DD_DEDUPLICATION_ALGORITHM_PER_PARSER + DD_HASHCODE_FIELDS_PER_SCANNER): Add checker of values Detect Merge Conflicts #21502: Pull request #11244 synchronize by kiblik
November 12, 2024 17:24 2m 27s
November 12, 2024 17:24 2m 27s
Release: Merge back 2.40.1 into dev from: master-into-dev/2.40.1-2.41.0-dev Detect Merge Conflicts #21501: Pull request #11249 synchronize by rossops
November 12, 2024 17:12 17s master-into-dev/2.40.1-2.41.0-dev
master-into-dev/2.40.1-2.41.0-dev
November 12, 2024 17:12 17s
Release: Merge back 2.40.1 into dev from: master-into-dev/2.40.1-2.41.0-dev Detect Merge Conflicts #21500: Pull request #11249 synchronize by rossops
November 12, 2024 17:12 27s
November 12, 2024 17:12 27s
Release: Merge back 2.40.1 into bugfix from: master-into-bugfix/2.40.1-2.41.0-dev Detect Merge Conflicts #21499: Pull request #11250 reopened by rossops
November 12, 2024 17:09 23s master-into-bugfix/2.40.1-2.41.0-dev
master-into-bugfix/2.40.1-2.41.0-dev
November 12, 2024 17:09 23s
🐛 fix bearer_cli #11245 Detect Merge Conflicts #21498: Pull request #11248 synchronize by manuel-sommer
November 12, 2024 16:49 22s manuel-sommer:fix_11245
manuel-sommer:fix_11245
November 12, 2024 16:49 22s
🐛 fix bearer_cli #11245 Detect Merge Conflicts #21497: Pull request #11248 synchronize by manuel-sommer
November 12, 2024 16:49 19s
November 12, 2024 16:49 19s
🐛 fix bearer_cli #11245 Detect Merge Conflicts #21496: Pull request #11248 opened by manuel-sommer
November 12, 2024 16:47 31s manuel-sommer:fix_11245
manuel-sommer:fix_11245
November 12, 2024 16:47 31s
Release: Merge release into master from: release/2.40.1 Detect Merge Conflicts #21495: Pull request #11246 reopened by rossops
November 12, 2024 16:35 1m 12s release/2.40.1
release/2.40.1
November 12, 2024 16:35 1m 12s
Update postgres:17.0-alpine Docker digest from 17.0 to 17.0-alpine (docker-compose.yml) Detect Merge Conflicts #21494: Pull request #11239 synchronize by renovate bot
November 12, 2024 16:29 2m 29s renovate/postgres-17.0-alpine
renovate/postgres-17.0-alpine
November 12, 2024 16:29 2m 29s
Update postgres:17.0-alpine Docker digest from 17.0 to 17.0-alpine (docker-compose.yml) Detect Merge Conflicts #21493: Pull request #11239 synchronize by renovate bot
November 12, 2024 16:29 2m 30s
November 12, 2024 16:29 2m 30s
🎉 Make Trivy Operator K8s vulnids consistent Detect Merge Conflicts #21492: Pull request #11188 synchronize by manuel-sommer
November 12, 2024 16:25 41s manuel-sommer:uniform_triyoperator_ids
manuel-sommer:uniform_triyoperator_ids
November 12, 2024 16:25 41s
🎉 Make Trivy Operator K8s vulnids consistent Detect Merge Conflicts #21491: Pull request #11188 synchronize by manuel-sommer
November 12, 2024 16:25 33s
November 12, 2024 16:25 33s
🎉 Make Trivy Operator K8s vulnids consistent Detect Merge Conflicts #21490: Pull request #11188 synchronize by manuel-sommer
November 12, 2024 16:24 1m 7s manuel-sommer:uniform_triyoperator_ids
manuel-sommer:uniform_triyoperator_ids
November 12, 2024 16:24 1m 7s
🎉 Make Trivy Operator K8s vulnids consistent Detect Merge Conflicts #21489: Pull request #11188 synchronize by manuel-sommer
November 12, 2024 16:24 1m 9s
November 12, 2024 16:24 1m 9s
🎉 Add DSA vulnid Detect Merge Conflicts #21488: Pull request #11238 synchronize by manuel-sommer
November 12, 2024 16:17 16s manuel-sommer:add_dsa
manuel-sommer:add_dsa
November 12, 2024 16:17 16s
🎉 Add DSA vulnid Detect Merge Conflicts #21487: Pull request #11238 synchronize by manuel-sommer
November 12, 2024 16:15 34s
November 12, 2024 16:15 34s
🎉 Add DSA vulnid Detect Merge Conflicts #21485: Pull request #11238 synchronize by rossops
November 12, 2024 16:02 2m 30s
November 12, 2024 16:02 2m 30s
🎉 Add DSA vulnid Detect Merge Conflicts #21486: Pull request #11238 synchronize by rossops
November 12, 2024 16:02 2m 29s manuel-sommer:add_dsa
manuel-sommer:add_dsa
November 12, 2024 16:02 2m 29s
chore(deps): update redis docker tag from 7.2.5 to v7.4.1 (docker-compose.yml) Detect Merge Conflicts #21484: Pull request #10651 synchronize by renovate bot
November 12, 2024 15:54 26s renovate/redis-7.x
renovate/redis-7.x
November 12, 2024 15:54 26s
chore(deps): update redis docker tag from 7.2.5 to v7.4.1 (docker-compose.yml) Detect Merge Conflicts #21483: Pull request #10651 synchronize by renovate bot
November 12, 2024 15:54 33s
November 12, 2024 15:54 33s
Update postgres:17.0-alpine Docker digest from 17.0 to 17.0-alpine (docker-compose.yml) Detect Merge Conflicts #21482: Pull request #11239 synchronize by renovate bot
November 12, 2024 15:53 4m 23s renovate/postgres-17.0-alpine
renovate/postgres-17.0-alpine
November 12, 2024 15:53 4m 23s
Update postgres:17.0-alpine Docker digest from 17.0 to 17.0-alpine (docker-compose.yml) Detect Merge Conflicts #21481: Pull request #11239 synchronize by renovate bot
November 12, 2024 15:53 21s
November 12, 2024 15:53 21s
feat(DD_DEDUPLICATION_ALGORITHM_PER_PARSER + DD_HASHCODE_FIELDS_PER_SCANNER): Add checker of values Detect Merge Conflicts #21480: Pull request #11244 synchronize by kiblik
November 12, 2024 15:28 17s kiblik:DD_DEDUPLICATION_checker
kiblik:DD_DEDUPLICATION_checker
November 12, 2024 15:28 17s
feat(DD_DEDUPLICATION_ALGORITHM_PER_PARSER + DD_HASHCODE_FIELDS_PER_SCANNER): Add checker of values Detect Merge Conflicts #21479: Pull request #11244 synchronize by kiblik
November 12, 2024 15:28 17s
November 12, 2024 15:28 17s
feat(DD_DEDUPLICATION_ALGORITHM_PER_PARSER + DD_HASHCODE_FIELDS_PER_SCANNER): Add checker of values Detect Merge Conflicts #21478: Pull request #11244 synchronize by kiblik
November 12, 2024 15:28 19s kiblik:DD_DEDUPLICATION_checker
kiblik:DD_DEDUPLICATION_checker
November 12, 2024 15:28 19s