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,015 workflow runs
9,015 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

feat(renovate): track oldest maintained k8s Detect Merge Conflicts #29834: Pull request #13670 opened by kiblik
19m 47s kiblik:renovate_oldest_maintained_bugfix
kiblik:renovate_oldest_maintained_bugfix
19m 47s
Update nginx/nginx-prometheus-exporter Docker tag from 1.4.2 to v1.5.1 (helm/defectdojo/values.yaml) Detect Merge Conflicts #29833: Pull request #13668 synchronize by renovate bot
8s
8s
Update nginx/nginx-prometheus-exporter Docker tag from 1.4.2 to v1.5.1 (helm/defectdojo/values.yaml) Detect Merge Conflicts #29832: Pull request #13668 synchronize by renovate bot
8s renovate/nginx-nginx-prometheus-exporter-1.x
renovate/nginx-nginx-prometheus-exporter-1.x
8s
chore(deps): update dependency renovatebot/renovate from 42.0.3 to v42.5.0 (.github/workflows/renovate.yaml) Detect Merge Conflicts #29831: Pull request #13651 synchronize by renovate bot
5s renovate/renovatebot-renovate-42.x
renovate/renovatebot-renovate-42.x
5s
chore(deps): update dependency renovatebot/renovate from 42.0.3 to v42.5.0 (.github/workflows/renovate.yaml) Detect Merge Conflicts #29830: Pull request #13651 synchronize by renovate bot
8s
8s
Update gcr.io/cloudsql-docker/gce-proxy Docker tag from 1.37.9 to v1.37.10 (helm/defectdojo/values.yaml) Detect Merge Conflicts #29829: Pull request #13666 synchronize by renovate bot
7s renovate/gcr.io-cloudsql-docker-gce-proxy-1.37.x
renovate/gcr.io-cloudsql-docker-gce-proxy-1.37.x
7s
Update gcr.io/cloudsql-docker/gce-proxy Docker tag from 1.37.9 to v1.37.10 (helm/defectdojo/values.yaml) Detect Merge Conflicts #29828: Pull request #13666 synchronize by renovate bot
9s
9s
Release: Merge back 2.52.1 into bugfix from: master-into-bugfix/2.52.1-2.53.0-dev Detect Merge Conflicts #29827: Pull request #13669 reopened by rossops
2m 10s master-into-bugfix/2.52.1-2.53.0-dev
master-into-bugfix/2.52.1-2.53.0-dev
2m 10s
Update nginx/nginx-prometheus-exporter Docker tag from 1.4.2 to v1.5.1 (helm/defectdojo/values.yaml) Detect Merge Conflicts #29826: Pull request #13668 opened by renovate bot
6m 44s renovate/nginx-nginx-prometheus-exporter-1.x
renovate/nginx-nginx-prometheus-exporter-1.x
6m 44s
🐛 harden jfrog xray unified file parsing #13628 Detect Merge Conflicts #29825: Pull request #13632 synchronize by manuel-sommer
12m 58s manuel-sommer:fix_13628
manuel-sommer:fix_13628
12m 58s
🐛 harden jfrog xray unified file parsing #13628 Detect Merge Conflicts #29824: Pull request #13632 synchronize by manuel-sommer
14m 15s
14m 15s
Update gcr.io/cloudsql-docker/gce-proxy Docker tag from 1.37.9 to v1.37.10 (helm/defectdojo/values.yaml) Detect Merge Conflicts #29823: Pull request #13666 opened by renovate bot
9s renovate/gcr.io-cloudsql-docker-gce-proxy-1.37.x
renovate/gcr.io-cloudsql-docker-gce-proxy-1.37.x
9s
Update dependency gohugoio/hugo from v0.152.1 to v0.152.2 (.github/workflows/validate_docs_build.yml) Detect Merge Conflicts #29822: Pull request #13665 opened by renovate bot
9s renovate/gohugoio-hugo-0.152.x
renovate/gohugoio-hugo-0.152.x
9s
chore(deps): update dependency renovatebot/renovate from 42.0.3 to v42.5.0 (.github/workflows/renovate.yaml) Detect Merge Conflicts #29821: Pull request #13651 synchronize by renovate bot
9s renovate/renovatebot-renovate-42.x
renovate/renovatebot-renovate-42.x
9s
chore(deps): update dependency renovatebot/renovate from 42.0.3 to v42.5.0 (.github/workflows/renovate.yaml) Detect Merge Conflicts #29820: Pull request #13651 synchronize by renovate bot
2m 6s
2m 6s
Release: Merge release into master from: release/2.52.1 Detect Merge Conflicts #29819: Pull request #13664 reopened by rossops
2m 11s release/2.52.1
release/2.52.1
2m 11s
Improve tag handling in importers and add tests for tag imports Detect Merge Conflicts #29818: Pull request #13650 synchronize by rossops
9s
9s
Improve tag handling in importers and add tests for tag imports Detect Merge Conflicts #29817: Pull request #13650 synchronize by rossops
9s importing-tags
importing-tags
9s
🎉 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