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,636 workflow run results
9,636 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

chore(deps): update actions/configure-pages action from v4 to v5 (.github/workflows/gh-pages.yml) Detect Merge Conflicts #22002: Pull request #11329 opened by renovate bot
November 26, 2024 00:07 2m 17s renovate/actions-configure-pages-5.x
renovate/actions-configure-pages-5.x
November 26, 2024 00:07 2m 17s
Docs: external image replacement, universal importer docs Detect Merge Conflicts #22001: Pull request #11328 opened by paulOsinski
November 25, 2024 22:25 2m 16s paulOsinski:docs-maintenance
paulOsinski:docs-maintenance
November 25, 2024 22:25 2m 16s
fix(ruff): Fix RUF039 for v0.8.0 Detect Merge Conflicts #22000: Pull request #11326 opened by kiblik
November 25, 2024 18:32 11s kiblik:ruff_0.8.0
kiblik:ruff_0.8.0
November 25, 2024 18:32 11s
Ruff: add and fix some SIM rules Detect Merge Conflicts #21999: Pull request #10926 synchronize by kiblik
November 25, 2024 18:12 11s kiblik:ruff_sim
kiblik:ruff_sim
November 25, 2024 18:12 11s
Ruff: add and fix some SIM rules Detect Merge Conflicts #21998: Pull request #10926 synchronize by kiblik
November 25, 2024 18:12 12s
November 25, 2024 18:12 12s
Add Filters to the Products under View Product Type Detect Merge Conflicts #21997: Pull request #11321 synchronize by hblankenship
November 25, 2024 17:53 13s hb-product-type-products-filters
hb-product-type-products-filters
November 25, 2024 17:53 13s
Add Filters to the Products under View Product Type Detect Merge Conflicts #21996: Pull request #11321 synchronize by hblankenship
November 25, 2024 17:53 11s
November 25, 2024 17:53 11s
Add Filters to the Products under View Product Type Detect Merge Conflicts #21995: Pull request #11321 synchronize by hblankenship
November 25, 2024 17:52 11s hb-product-type-products-filters
hb-product-type-products-filters
November 25, 2024 17:52 11s
Add Filters to the Products under View Product Type Detect Merge Conflicts #21994: Pull request #11321 synchronize by hblankenship
November 25, 2024 17:52 14s
November 25, 2024 17:52 14s
Add GLSA gentoo vulnid Detect Merge Conflicts #21993: Pull request #9813 synchronize by manuel-sommer
November 25, 2024 17:42 21s manuel-sommer:remove_psycopg2
manuel-sommer:remove_psycopg2
November 25, 2024 17:42 21s
Add GLSA gentoo vulnid Detect Merge Conflicts #21992: Pull request #9813 synchronize by manuel-sommer
November 25, 2024 17:42 18s
November 25, 2024 17:42 18s
Add GLSA gentoo vulnid Detect Merge Conflicts #21990: Pull request #9813 synchronize by manuel-sommer
November 25, 2024 17:39 2m 13s
November 25, 2024 17:39 2m 13s
Add GLSA gentoo vulnid Detect Merge Conflicts #21991: Pull request #9813 synchronize by manuel-sommer
November 25, 2024 17:39 14s manuel-sommer:remove_psycopg2
manuel-sommer:remove_psycopg2
November 25, 2024 17:39 14s
Release: Merge back 2.40.3 into dev from: master-into-dev/2.40.3-2.41.0-dev Detect Merge Conflicts #21989: Pull request #11325 synchronize by rossops
November 25, 2024 17:12 10s master-into-dev/2.40.3-2.41.0-dev
master-into-dev/2.40.3-2.41.0-dev
November 25, 2024 17:12 10s
Release: Merge back 2.40.3 into dev from: master-into-dev/2.40.3-2.41.0-dev Detect Merge Conflicts #21988: Pull request #11325 synchronize by rossops
November 25, 2024 17:12 13s
November 25, 2024 17:12 13s
Add Filters to the Products under View Product Type Detect Merge Conflicts #21987: Pull request #11321 synchronize by Maffooch
November 25, 2024 16:58 11s hb-product-type-products-filters
hb-product-type-products-filters
November 25, 2024 16:58 11s
Add Filters to the Products under View Product Type Detect Merge Conflicts #21986: Pull request #11321 synchronize by Maffooch
November 25, 2024 16:58 10s
November 25, 2024 16:58 10s
Release: Merge back 2.40.3 into bugfix from: master-into-bugfix/2.40.3-2.41.0-dev Detect Merge Conflicts #21985: Pull request #11324 reopened by rossops
November 25, 2024 16:57 10s master-into-bugfix/2.40.3-2.41.0-dev
master-into-bugfix/2.40.3-2.41.0-dev
November 25, 2024 16:57 10s
Release: Merge back 2.40.3 into dev from: master-into-dev/2.40.3-2.41.0-dev Detect Merge Conflicts #21984: Pull request #11325 synchronize by rossops
November 25, 2024 16:56 14s master-into-dev/2.40.3-2.41.0-dev
master-into-dev/2.40.3-2.41.0-dev
November 25, 2024 16:56 14s
Release: Merge back 2.40.3 into dev from: master-into-dev/2.40.3-2.41.0-dev Detect Merge Conflicts #21983: Pull request #11325 synchronize by rossops
November 25, 2024 16:56 11s
November 25, 2024 16:56 11s
Update Helm release postgresql-ha from 9.4.11 to v15 (helm/defectdojo/Chart.yaml) Detect Merge Conflicts #21982: Pull request #11323 opened by renovate bot
November 25, 2024 16:26 13s renovate/postgresql-ha-15.x
renovate/postgresql-ha-15.x
November 25, 2024 16:26 13s
Release: Merge release into master from: release/2.40.3 Detect Merge Conflicts #21981: Pull request #11322 reopened by rossops
November 25, 2024 16:24 10s release/2.40.3
release/2.40.3
November 25, 2024 16:24 10s
Add Filters to the Products under View Product Type Detect Merge Conflicts #21980: Pull request #11321 opened by hblankenship
November 25, 2024 16:19 12s hb-product-type-products-filters
hb-product-type-products-filters
November 25, 2024 16:19 12s
Update 2.36.md to fix typo's in version number Detect Merge Conflicts #21979: Pull request #11319 opened by valentijnscholten
November 25, 2024 15:52 14s valentijnscholten:patch-1
valentijnscholten:patch-1
November 25, 2024 15:52 14s
Bump boto3 from 1.35.67 to 1.35.68 Detect Merge Conflicts #21978: Pull request #11318 opened by dependabot bot
November 25, 2024 12:44 15s dependabot/pip/dev/boto3-1.35.68
dependabot/pip/dev/boto3-1.35.68
November 25, 2024 12:44 15s