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

9,088 workflow runs

docs: Update the API pull documentation Detect Merge Conflicts #29886: Pull request #13689 opened by sNiXx

12s sNiXx:api-docs-update

sNiXx:api-docs-update

12s

Update dependency node from 24.11.0 to v24.11.1 (.github/workflows/validate_docs_build.yml) Detect Merge Conflicts #29883: Pull request #13686 opened by renovate bot

8s renovate/node-24.11.x

renovate/node-24.11.x

8s

docs: Update DrHeader parser documentation Detect Merge Conflicts #29882: Pull request #13685 opened by skywalke34

10s skywalke34:update-drheader-docs

skywalke34:update-drheader-docs

10s

🎉 Add Kubeaudit fix_available field Detect Merge Conflicts #29881: Pull request #13684 opened by manuel-sommer

7s manuel-sommer:kubeaudit_fixavailable

manuel-sommer:kubeaudit_fixavailable

7s

Fix Duplicate Findings in Github SAST Scan by Improving Hash Code Detect Merge Conflicts #29880: Pull request #13683 opened by Logicmn

7s Logicmn:github-sast-hash-code

Logicmn:github-sast-hash-code

7s

reimport: support pro compute hash code method Detect Merge Conflicts #29879: Pull request #13680 synchronize by valentijnscholten

1m 53s valentijnscholten:pro-hash-code-reimport-fix

valentijnscholten:pro-hash-code-reimport-fix

1m 53s

reimport: support pro compute hash code method Detect Merge Conflicts #29878: Pull request #13680 synchronize by valentijnscholten

2m 5s

2m 5s

reimport: support pro compute hash code method Detect Merge Conflicts #29877: Pull request #13680 opened by valentijnscholten

5s valentijnscholten:pro-hash-code-reimport-fix

valentijnscholten:pro-hash-code-reimport-fix

5s

log a line when custom hash method is used Detect Merge Conflicts #29876: Pull request #13679 opened by valentijnscholten

12s valentijnscholten:log-custom-hash-method

valentijnscholten:log-custom-hash-method

12s

fix(helm): merge extraAnnotations with init job annotations Detect Merge Conflicts #29875: Pull request #13677 synchronize by qlimenoque

9s qlimenoque:fix/init-job-extra-annotations

qlimenoque:fix/init-job-extra-annotations

9s

fix(helm): merge extraAnnotations with init job annotations Detect Merge Conflicts #29874: Pull request #13677 synchronize by qlimenoque

8s

8s

fix(helm): merge extraAnnotations with init job annotations Detect Merge Conflicts #29873: Pull request #13677 synchronize by qlimenoque

11s qlimenoque:fix/init-job-extra-annotations

qlimenoque:fix/init-job-extra-annotations

11s

fix(helm): merge extraAnnotations with init job annotations Detect Merge Conflicts #29872: Pull request #13677 synchronize by qlimenoque

9s

9s

fix(helm): merge extraAnnotations with init job annotations Detect Merge Conflicts #29871: Pull request #13677 opened by qlimenoque

8s qlimenoque:fix/init-job-extra-annotations

qlimenoque:fix/init-job-extra-annotations

8s

chore(deps): bump boto3 from 1.40.69 to 1.40.70 Detect Merge Conflicts #29870: Pull request #13676 opened by dependabot bot

14s dependabot/pip/dev/boto3-1.40.70

dependabot/pip/dev/boto3-1.40.70

14s

Feat: Add HPA & PDB Helm Chart Support #13391 Detect Merge Conflicts #29869: Pull request #13512 synchronize by carlosmt86

27s carlosmt86:feat/chart_hpa_pdb_13391

carlosmt86:feat/chart_hpa_pdb_13391

27s

Feat: Add HPA & PDB Helm Chart Support #13391 Detect Merge Conflicts #29868: Pull request #13512 synchronize by carlosmt86

8s

8s

🎉 Add VA vulnid Detect Merge Conflicts #29867: Pull request #13675 opened by manuel-sommer

2m 9s manuel-sommer:va_vulnid

manuel-sommer:va_vulnid

2m 9s

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

6s manuel-sommer:implement_oidc_groups

manuel-sommer:implement_oidc_groups

6s

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

6s

6s

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

9s manuel-sommer:ibmapp_parserfixavailable

manuel-sommer:ibmapp_parserfixavailable

9s

Update gcr.io/cloudsql-docker/gce-proxy Docker tag from 1.37.9 to v1.37.10 (helm/defectdojo/values.yaml) Detect Merge Conflicts #29863: Pull request #13666 reopened by kiblik

57s renovate/gcr.io-cloudsql-docker-gce-proxy-1.37.x

renovate/gcr.io-cloudsql-docker-gce-proxy-1.37.x

57s

Update dependency @docsearch/js from 4.3.1 to v4.3.2 (docs/package.json) Detect Merge Conflicts #29862: Pull request #13674 synchronize by renovate bot

1m 9s renovate/docsearch-js-4.3.x

renovate/docsearch-js-4.3.x

1m 9s

Update dependency @docsearch/js from 4.3.1 to v4.3.2 (docs/package.json) Detect Merge Conflicts #29861: Pull request #13674 synchronize by renovate bot

2m 14s

2m 14s

Update gcr.io/cloudsql-docker/gce-proxy Docker tag from 1.37.9 to v1.37.10 (helm/defectdojo/values.yaml) Detect Merge Conflicts #29860: Pull request #13666 synchronize by renovate bot

1m 7s renovate/gcr.io-cloudsql-docker-gce-proxy-1.37.x

renovate/gcr.io-cloudsql-docker-gce-proxy-1.37.x

1m 7s