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
10,169 workflow runs
10,169 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Pro Release Notes 2.42.2 Detect Merge Conflicts #22954: Pull request #11611 synchronize by paulOsinski
January 21, 2025 22:26 10s paulOsinski:releasenotes
paulOsinski:releasenotes
January 21, 2025 22:26 10s
chore(deps): update helm release postgresql-ha from 9.4.11 to v15 (helm/defectdojo/chart.yaml) Detect Merge Conflicts #22953: Pull request #11323 synchronize by renovate bot
January 21, 2025 22:26 10s renovate/postgresql-ha-15.x
renovate/postgresql-ha-15.x
January 21, 2025 22:26 10s
chore(deps): update helm release postgresql-ha from 9.4.11 to v15 (helm/defectdojo/chart.yaml) Detect Merge Conflicts #22952: Pull request #11323 synchronize by renovate bot
January 21, 2025 22:26 13s
January 21, 2025 22:26 13s
Pro Release Notes 2.42.2 Detect Merge Conflicts #22951: Pull request #11611 synchronize by paulOsinski
January 21, 2025 22:26 11s
January 21, 2025 22:26 11s
fix(deps): update dependency @tabler/icons from 3.28.1 to v3.29.0 (docs/package.json) Detect Merge Conflicts #22950: Pull request #11612 opened by renovate bot
January 21, 2025 22:25 2m 10s renovate/tabler-icons-3.x-lockfile
renovate/tabler-icons-3.x-lockfile
January 21, 2025 22:25 2m 10s
Mend SCA Parser update Detect Merge Conflicts #22949: Pull request #11395 synchronize by testaccount90009
January 21, 2025 21:33 11s testaccount90009:dev
testaccount90009:dev
January 21, 2025 21:33 11s
Mend SCA Parser update Detect Merge Conflicts #22948: Pull request #11395 synchronize by testaccount90009
January 21, 2025 21:33 10s
January 21, 2025 21:33 10s
Pro Release Notes 2.42.2 Detect Merge Conflicts #22947: Pull request #11611 synchronize by paulOsinski
January 21, 2025 21:27 10s paulOsinski:releasenotes
paulOsinski:releasenotes
January 21, 2025 21:27 10s
Pro Release Notes 2.42.2 Detect Merge Conflicts #22946: Pull request #11611 synchronize by paulOsinski
January 21, 2025 21:27 10s
January 21, 2025 21:27 10s
Pro Release Notes 2.42.2 Detect Merge Conflicts #22945: Pull request #11611 opened by paulOsinski
January 21, 2025 21:16 13s paulOsinski:releasenotes
paulOsinski:releasenotes
January 21, 2025 21:16 13s
Readme docs - followup PR Detect Merge Conflicts #22944: Pull request #11525 synchronize by paulOsinski
January 21, 2025 20:54 28s paulOsinski:readme-docs
paulOsinski:readme-docs
January 21, 2025 20:54 28s
Readme docs - followup PR Detect Merge Conflicts #22943: Pull request #11525 synchronize by paulOsinski
January 21, 2025 20:54 20s
January 21, 2025 20:54 20s
feat(disclaimers): Split disclaimers Detect Merge Conflicts #22942: Pull request #10902 synchronize by kiblik
January 21, 2025 20:50 1m 18s kiblik:disclaimers
kiblik:disclaimers
January 21, 2025 20:50 1m 18s
feat(disclaimers): Split disclaimers Detect Merge Conflicts #22941: Pull request #10902 synchronize by kiblik
January 21, 2025 20:50 16s
January 21, 2025 20:50 16s
feat(disclaimers): Split disclaimers Detect Merge Conflicts #22940: Pull request #10902 synchronize by kiblik
January 21, 2025 20:50 10s kiblik:disclaimers
kiblik:disclaimers
January 21, 2025 20:50 10s
feat(disclaimers): Split disclaimers Detect Merge Conflicts #22939: Pull request #10902 synchronize by kiblik
January 21, 2025 20:50 10s
January 21, 2025 20:50 10s
Bump vite from 6.0.7 to 6.0.9 in /docs Detect Merge Conflicts #22938: Pull request #11610 opened by dependabot bot
January 21, 2025 20:46 13s dependabot/npm_and_yarn/docs/vite-6.0.9
dependabot/npm_and_yarn/docs/vite-6.0.9
January 21, 2025 20:46 13s
chore(deps): update helm release postgresql from 16.3.5 to ~16.4.0 (helm/defectdojo/chart.yaml) Detect Merge Conflicts #22937: Pull request #11609 opened by renovate bot
January 21, 2025 16:42 2m 16s renovate/postgresql-16.x
renovate/postgresql-16.x
January 21, 2025 16:42 2m 16s
Make links in the login page visually obvious Detect Merge Conflicts #22936: Pull request #11474 synchronize by oussama-taoufiq
January 21, 2025 16:26 2m 12s oussama-taoufiq:accessibility-issues
oussama-taoufiq:accessibility-issues
January 21, 2025 16:26 2m 12s
Make links in the login page visually obvious Detect Merge Conflicts #22935: Pull request #11474 synchronize by oussama-taoufiq
January 21, 2025 16:26 10s
January 21, 2025 16:26 10s
Make links in the login page visually obvious Detect Merge Conflicts #22933: Pull request #11474 synchronize by oussama-taoufiq
January 21, 2025 16:04 12s
January 21, 2025 16:04 12s
Release: Merge back 2.42.2 into dev from: master-into-dev/2.42.2-2.43.0-dev Detect Merge Conflicts #22932: Pull request #11607 synchronize by rossops
January 21, 2025 16:02 2m 11s master-into-dev/2.42.2-2.43.0-dev
master-into-dev/2.42.2-2.43.0-dev
January 21, 2025 16:02 2m 11s
Release: Merge back 2.42.2 into dev from: master-into-dev/2.42.2-2.43.0-dev Detect Merge Conflicts #22931: Pull request #11607 synchronize by rossops
January 21, 2025 16:02 21s
January 21, 2025 16:02 21s
Release: Merge back 2.42.2 into bugfix from: master-into-bugfix/2.42.2-2.43.0-dev Detect Merge Conflicts #22930: Pull request #11608 reopened by rossops
January 21, 2025 16:01 40s master-into-bugfix/2.42.2-2.43.0-dev
master-into-bugfix/2.42.2-2.43.0-dev
January 21, 2025 16:01 40s
Release: Merge release into master from: release/2.42.2 Detect Merge Conflicts #22929: Pull request #11605 synchronize by rossops
January 21, 2025 15:26 10s release/2.42.2
release/2.42.2
January 21, 2025 15:26 10s