Detect Merge Conflicts · Workflow runs · DefectDojo/django-DefectDojo · GitHub

Actions

All workflows
Workflows
- .github/workflows/security-checks.yml .github/workflows/security-checks.yml
- .github/workflows/security-gateway.yml .github/workflows/security-gateway.yml
- Build Docker Images For Testing Build Docker Images For Testing
- Cancel outdated workflow runs Cancel outdated workflow runs
- ci ci
- Daily PR Review Reminder Daily PR Review Reminder
- Dependabot Updates Dependabot Updates
- Detect Merge Conflicts Detect Merge Conflicts
- Docs: Dry Run Production Deployment Docs: Dry Run Production Deployment
- Fetch OpenAPI Specifications Fetch OpenAPI Specifications
Management
- Caches
- Deployments

Detect Merge Conflicts

Actions

Loading...
Loading

detect-merge-conflicts.yaml

9,022 workflow runs

9,022 workflow runs

🎉 Advance ibm app parser with fix_available Detect Merge Conflicts #29816: Pull request #13663 synchronize by manuel-sommer

7s manuel-sommer:ibmapp_parserfixavailable

manuel-sommer:ibmapp_parserfixavailable

7s

🎉 Advance ibm app parser with fix_available Detect Merge Conflicts #29815: Pull request #13663 synchronize by manuel-sommer

9s

9s

🐛 harden jfrog xray unified file parsing #13628 Detect Merge Conflicts #29814: Pull request #13632 synchronize by manuel-sommer

12s manuel-sommer:fix_13628

manuel-sommer:fix_13628

12s

🐛 harden jfrog xray unified file parsing #13628 Detect Merge Conflicts #29813: Pull request #13632 synchronize by manuel-sommer

7s

7s

🎉 Advance ibm app parser with fix_available Detect Merge Conflicts #29812: Pull request #13663 synchronize by manuel-sommer

6s manuel-sommer:ibmapp_parserfixavailable

manuel-sommer:ibmapp_parserfixavailable

6s

🎉 Advance ibm app parser with fix_available Detect Merge Conflicts #29811: Pull request #13663 synchronize by manuel-sommer

6s

6s

🎉 Advance ibm app parser with fix_available Detect Merge Conflicts #29810: Pull request #13663 opened by manuel-sommer

2m 8s manuel-sommer:ibmapp_parserfixavailable

manuel-sommer:ibmapp_parserfixavailable

2m 8s

chore(deps): update softprops/action-gh-release action from v2.4.1 to v2.4.2 (.github/workflows/release-x-manual-helm-chart.yml) Detect Merge Conflicts #29809: Pull request #13654 synchronize by renovate bot

2m 6s renovate/softprops-action-gh-release-2.4.x

renovate/softprops-action-gh-release-2.4.x

2m 6s

chore(deps): update softprops/action-gh-release action from v2.4.1 to v2.4.2 (.github/workflows/release-x-manual-helm-chart.yml) Detect Merge Conflicts #29808: Pull request #13654 synchronize by renovate bot

2m 10s

2m 10s

🐛 fix debug mode in logging #13659 Detect Merge Conflicts #29807: Pull request #13662 opened by manuel-sommer

7s manuel-sommer:issue_13659

manuel-sommer:issue_13659

7s

chore(deps): bump boto3 from 1.40.68 to 1.40.69 Detect Merge Conflicts #29806: Pull request #13661 opened by dependabot bot

1m 21s dependabot/pip/dev/boto3-1.40.69

dependabot/pip/dev/boto3-1.40.69

1m 21s

🎉 add Dawnscanner fix_available field. Detect Merge Conflicts #29805: Pull request #13660 opened by manuel-sommer

5s manuel-sommer:dawnscanner_fixavailable

manuel-sommer:dawnscanner_fixavailable

5s

chore(deps): update dependency renovatebot/renovate from 42.0.3 to v42.5.0 (.github/workflows/renovate.yaml) Detect Merge Conflicts #29804: Pull request #13651 synchronize by renovate bot

8s renovate/renovatebot-renovate-42.x

renovate/renovatebot-renovate-42.x

8s

chore(deps): update dependency renovatebot/renovate from 42.0.3 to v42.5.0 (.github/workflows/renovate.yaml) Detect Merge Conflicts #29803: Pull request #13651 synchronize by renovate bot

9s

9s

🎉 implement new threatmapper file format #13639 Detect Merge Conflicts #29802: Pull request #13655 synchronize by manuel-sommer

6s manuel-sommer:fix_13639

manuel-sommer:fix_13639

6s

🎉 implement new threatmapper file format #13639 Detect Merge Conflicts #29801: Pull request #13655 synchronize by manuel-sommer

9s

9s

🐛 fix nancy severity calculation #13656 Detect Merge Conflicts #29800: Pull request #13657 synchronize by manuel-sommer

9s manuel-sommer:fix_nancy_severity

manuel-sommer:fix_nancy_severity

9s

🐛 fix nancy severity calculation #13656 Detect Merge Conflicts #29799: Pull request #13657 synchronize by manuel-sommer

8s

8s

🐛 harden jfrog xray unified file parsing #13628 Detect Merge Conflicts #29798: Pull request #13632 synchronize by manuel-sommer

8s manuel-sommer:fix_13628

manuel-sommer:fix_13628

8s

🐛 harden jfrog xray unified file parsing #13628 Detect Merge Conflicts #29797: Pull request #13632 synchronize by manuel-sommer

7s

7s

Advance OIDC to enable groups mapping Detect Merge Conflicts #29796: Pull request #13489 synchronize by manuel-sommer

2m 10s manuel-sommer:implement_oidc_groups

manuel-sommer:implement_oidc_groups

2m 10s

Advance OIDC to enable groups mapping Detect Merge Conflicts #29795: Pull request #13489 synchronize by manuel-sommer

2m 12s

2m 12s

🐛 fix nancy severity calculation #13656 Detect Merge Conflicts #29794: Pull request #13657 opened by manuel-sommer

7s manuel-sommer:fix_nancy_severity

manuel-sommer:fix_nancy_severity

7s

💄 Nancy parser docs: fix tool link Detect Merge Conflicts #29793: Pull request #13633 synchronize by manuel-sommer

2m 8s manuel-sommer:nancy_link

manuel-sommer:nancy_link

2m 8s

💄 Nancy parser docs: fix tool link Detect Merge Conflicts #29792: Pull request #13633 synchronize by manuel-sommer

2m 8s

2m 8s