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
1,934 workflow run results
1,934 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

✨ merge clair and clair klar together Detect Merge Conflicts #14085: Pull request #9355 synchronize by manuel-sommer
January 17, 2024 23:30 14s manuel-sommer:merge_clair_clairklar
manuel-sommer:merge_clair_clairklar
January 17, 2024 23:30 14s
✨ merge clair and clair klar together Detect Merge Conflicts #14084: Pull request #9355 synchronize by manuel-sommer
January 17, 2024 23:30 13s
January 17, 2024 23:30 13s
✨ merge clair and clair klar together Detect Merge Conflicts #14083: Pull request #9355 opened by manuel-sommer
January 17, 2024 23:01 12s manuel-sommer:merge_clair_clairklar
manuel-sommer:merge_clair_clairklar
January 17, 2024 23:01 12s
Update gcr.io/cloudsql-docker/gce-proxy Docker tag from 1.33.15 to v1.33.16 (helm/defectdojo/values.yaml) Detect Merge Conflicts #14082: Pull request #9354 opened by renovate bot
January 17, 2024 22:58 9s renovate/gcr.io-cloudsql-docker-gce-proxy-1.x
renovate/gcr.io-cloudsql-docker-gce-proxy-1.x
January 17, 2024 22:58 9s
🎉 merge OpenVAS XML and CSV parsers Detect Merge Conflicts #14081: Pull request #9322 synchronize by manuel-sommer
January 17, 2024 21:53 13s manuel-sommer:merge_openvas_xml_csv
manuel-sommer:merge_openvas_xml_csv
January 17, 2024 21:53 13s
🎉 merge OpenVAS XML and CSV parsers Detect Merge Conflicts #14080: Pull request #9322 synchronize by manuel-sommer
January 17, 2024 21:53 12s
January 17, 2024 21:53 12s
🎉 Improvements for wazuh importer Detect Merge Conflicts #14078: Pull request #9248 synchronize by quirinziessler
January 17, 2024 20:39 9s quirinziessler:wazuh-importer-improvements
quirinziessler:wazuh-importer-improvements
January 17, 2024 20:39 9s
🎉 Improvements for wazuh importer Detect Merge Conflicts #14079: Pull request #9248 synchronize by quirinziessler
January 17, 2024 20:39 10s
January 17, 2024 20:39 10s
🎉 Improvements for wazuh importer Detect Merge Conflicts #14077: Pull request #9248 synchronize by quirinziessler
January 17, 2024 20:39 14s quirinziessler:wazuh-importer-improvements
quirinziessler:wazuh-importer-improvements
January 17, 2024 20:39 14s
🎉 Improvements for wazuh importer Detect Merge Conflicts #14076: Pull request #9248 synchronize by quirinziessler
January 17, 2024 20:39 14s
January 17, 2024 20:39 14s
🎉 Improvements for wazuh importer Detect Merge Conflicts #14075: Pull request #9248 synchronize by quirinziessler
January 17, 2024 20:37 12s quirinziessler:wazuh-importer-improvements
quirinziessler:wazuh-importer-improvements
January 17, 2024 20:37 12s
🎉 Improvements for wazuh importer Detect Merge Conflicts #14074: Pull request #9248 synchronize by quirinziessler
January 17, 2024 20:37 15s
January 17, 2024 20:37 15s
🎉 Improvements for wazuh importer Detect Merge Conflicts #14073: Pull request #9248 synchronize by quirinziessler
January 17, 2024 19:58 11s quirinziessler:wazuh-importer-improvements
quirinziessler:wazuh-importer-improvements
January 17, 2024 19:58 11s
🎉 Improvements for wazuh importer Detect Merge Conflicts #14072: Pull request #9248 synchronize by quirinziessler
January 17, 2024 19:58 14s
January 17, 2024 19:58 14s
✨ Implement Chef InSpec Parser Detect Merge Conflicts #14071: Pull request #9329 synchronize by manuel-sommer
January 17, 2024 19:11 2m 15s manuel-sommer:implement_chefinspect
manuel-sommer:implement_chefinspect
January 17, 2024 19:11 2m 15s
✨ Implement Chef InSpec Parser Detect Merge Conflicts #14070: Pull request #9329 synchronize by manuel-sommer
January 17, 2024 19:11 2m 14s
January 17, 2024 19:11 2m 14s
API: removal of drf_yasg (OpenAPI 2.0 Swagger) Detect Merge Conflicts #14069: Pull request #9108 synchronize by Maffooch
January 17, 2024 18:03 17s kiblik:api_remove_drf_yasg
kiblik:api_remove_drf_yasg
January 17, 2024 18:03 17s
API: removal of drf_yasg (OpenAPI 2.0 Swagger) Detect Merge Conflicts #14068: Pull request #9108 synchronize by Maffooch
January 17, 2024 18:03 19s
January 17, 2024 18:03 19s
🎉 Improvements for wazuh importer Detect Merge Conflicts #14067: Pull request #9248 synchronize by Maffooch
January 17, 2024 18:00 14s quirinziessler:wazuh-importer-improvements
quirinziessler:wazuh-importer-improvements
January 17, 2024 18:00 14s
🎉 Improvements for wazuh importer Detect Merge Conflicts #14066: Pull request #9248 synchronize by Maffooch
January 17, 2024 18:00 15s
January 17, 2024 18:00 15s
Update dependency autoprefixer from 10.4.16 to v10.4.17 (docs/package.json) Detect Merge Conflicts #14065: Pull request #9353 opened by renovate bot
January 17, 2024 17:58 2m 13s renovate/autoprefixer-10.x
renovate/autoprefixer-10.x
January 17, 2024 17:58 2m 13s
Bump netaddr from 0.8.0 to 0.10.1 Detect Merge Conflicts #14064: Pull request #9264 synchronize by dependabot bot
January 17, 2024 16:30 12s dependabot/pip/dev/netaddr-0.10.1
dependabot/pip/dev/netaddr-0.10.1
January 17, 2024 16:30 12s
Bump netaddr from 0.8.0 to 0.10.1 Detect Merge Conflicts #14063: Pull request #9264 synchronize by dependabot bot
January 17, 2024 16:30 12s
January 17, 2024 16:30 12s
Bump django from 4.1.13 to 5.0.1 Detect Merge Conflicts #14061: Pull request #9258 synchronize by dependabot bot
January 17, 2024 16:30 15s dependabot/pip/dev/django-5.0.1
dependabot/pip/dev/django-5.0.1
January 17, 2024 16:30 15s
Bump django from 4.1.13 to 5.0.1 Detect Merge Conflicts #14062: Pull request #9258 synchronize by dependabot bot
January 17, 2024 16:30 2m 13s
January 17, 2024 16:30 2m 13s