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,046 workflow runs

9,046 workflow runs

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

2m 36s

2m 36s

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

3m 0s manuel-sommer:fix_13639

manuel-sommer:fix_13639

3m 0s

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

2m 37s

2m 37s

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

7s manuel-sommer:fix_13639

manuel-sommer:fix_13639

7s

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

1m 48s manuel-sommer:implement_oidc_groups

manuel-sommer:implement_oidc_groups

1m 48s

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

1m 38s

1m 38s

🎉 Make social auth exceptions configurable Detect Merge Conflicts #29784: Pull request #13596 synchronize by manuel-sommer

2m 39s manuel-sommer:make_social_auth_exception_configurable

manuel-sommer:make_social_auth_exception_configurable

2m 39s

🎉 Make social auth exceptions configurable Detect Merge Conflicts #29783: Pull request #13596 synchronize by manuel-sommer

2m 22s

2m 22s

🎉 Make social auth exceptions configurable Detect Merge Conflicts #29782: Pull request #13596 synchronize by manuel-sommer

6s manuel-sommer:make_social_auth_exception_configurable

manuel-sommer:make_social_auth_exception_configurable

6s

🎉 Make social auth exceptions configurable Detect Merge Conflicts #29781: Pull request #13596 synchronize by manuel-sommer

6s

6s

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

6s renovate/renovatebot-renovate-42.x

renovate/renovatebot-renovate-42.x

6s

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

5s

5s

Deduplicate findings in batches Detect Merge Conflicts #29778: Pull request #13491 synchronize by valentijnscholten

1m 43s valentijnscholten:dedupe-batching

valentijnscholten:dedupe-batching

1m 43s

Deduplicate findings in batches Detect Merge Conflicts #29777: Pull request #13491 synchronize by valentijnscholten

1m 23s

1m 23s

Deduplicate findings in batches Detect Merge Conflicts #29776: Pull request #13491 synchronize by valentijnscholten

9s valentijnscholten:dedupe-batching

valentijnscholten:dedupe-batching

9s

Deduplicate findings in batches Detect Merge Conflicts #29775: Pull request #13491 synchronize by valentijnscholten

9s

9s

Deduplicate findings in batches Detect Merge Conflicts #29774: Pull request #13491 synchronize by valentijnscholten

37s valentijnscholten:dedupe-batching

valentijnscholten:dedupe-batching

37s

Deduplicate findings in batches Detect Merge Conflicts #29773: Pull request #13491 synchronize by valentijnscholten

32s

32s

Deduplicate findings in batches Detect Merge Conflicts #29772: Pull request #13491 synchronize by valentijnscholten

3m 31s valentijnscholten:dedupe-batching

valentijnscholten:dedupe-batching

3m 31s

Deduplicate findings in batches Detect Merge Conflicts #29771: Pull request #13491 synchronize by valentijnscholten

3m 14s

3m 14s

Deduplicate findings in batches Detect Merge Conflicts #29770: Pull request #13491 synchronize by valentijnscholten

51s valentijnscholten:dedupe-batching

valentijnscholten:dedupe-batching

51s

Deduplicate findings in batches Detect Merge Conflicts #29769: Pull request #13491 synchronize by valentijnscholten

1m 2s

1m 2s

Deduplicate findings in batches Detect Merge Conflicts #29768: Pull request #13491 synchronize by valentijnscholten

2m 9s valentijnscholten:dedupe-batching

valentijnscholten:dedupe-batching

2m 9s

Deduplicate findings in batches Detect Merge Conflicts #29767: Pull request #13491 synchronize by valentijnscholten

2m 8s

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 #29766: Pull request #13654 opened by renovate bot

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

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

10s