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
5,417 workflow run results
5,417 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

fix(integrity check): update hash + handle collectstatic Detect Merge Conflicts #17899: Pull request #10241 synchronize by kiblik
May 21, 2024 11:09 5h 44m 26s
May 21, 2024 11:09 5h 44m 26s
fix(integrity check): update hash + handle collectstatic Detect Merge Conflicts #17898: Pull request #10241 synchronize by kiblik
May 21, 2024 10:48 11s kiblik:fix_integrity_check
kiblik:fix_integrity_check
May 21, 2024 10:48 11s
fix(integrity check): update hash + handle collectstatic Detect Merge Conflicts #17897: Pull request #10241 synchronize by kiblik
May 21, 2024 10:48 13s
May 21, 2024 10:48 13s
fix(integrity check): update hash + handle collectstatic Detect Merge Conflicts #17896: Pull request #10241 synchronize by kiblik
May 21, 2024 10:20 12s kiblik:fix_integrity_check
kiblik:fix_integrity_check
May 21, 2024 10:20 12s
fix(integrity check): update hash + handle collectstatic Detect Merge Conflicts #17895: Pull request #10241 synchronize by kiblik
May 21, 2024 10:20 15s
May 21, 2024 10:20 15s
fix(integrity check): update hash + handle collectstatic Detect Merge Conflicts #17894: Pull request #10241 opened by kiblik
May 21, 2024 09:49 1m 12s kiblik:fix_integrity_check
kiblik:fix_integrity_check
May 21, 2024 09:49 1m 12s
Ruff: Add FIX001 and FIX003 Detect Merge Conflicts #17893: Pull request #10240 reopened by manuel-sommer
May 21, 2024 09:40 10s manuel-sommer:fix_integrity_settingsdistpy
manuel-sommer:fix_integrity_settingsdistpy
May 21, 2024 09:40 10s
Ruff: Add FIX001 and FIX003 Detect Merge Conflicts #17892: Pull request #10240 opened by manuel-sommer
May 21, 2024 09:28 13s manuel-sommer:fix_integrity_settingsdistpy
manuel-sommer:fix_integrity_settingsdistpy
May 21, 2024 09:28 13s
Bump requests from 2.31.0 to 2.32.0 Detect Merge Conflicts #17891: Pull request #10236 opened by dependabot bot
May 21, 2024 05:42 34s dependabot/pip/requests-2.32.0
dependabot/pip/requests-2.32.0
May 21, 2024 05:42 34s
Import History: Adding a few tests Detect Merge Conflicts #17890: Pull request #10235 opened by Maffooch
May 21, 2024 03:50 10s import-history-tests
import-history-tests
May 21, 2024 03:50 10s
chore(deps): update redis docker tag from 7.2.4 to v7.2.5 (docker-compose.yml) Detect Merge Conflicts #17889: Pull request #10234 opened by renovate bot
May 21, 2024 02:47 2m 12s renovate/redis-7.x
renovate/redis-7.x
May 21, 2024 02:47 2m 12s
chore(deps): update helm release postgresql-ha from 9.4.11 to v14 (helm/defectdojo/chart.yaml) Detect Merge Conflicts #17888: Pull request #9859 synchronize by renovate bot
May 20, 2024 19:15 11s renovate/postgresql-ha-14.x
renovate/postgresql-ha-14.x
May 20, 2024 19:15 11s
chore(deps): update helm release postgresql-ha from 9.4.11 to v14 (helm/defectdojo/chart.yaml) Detect Merge Conflicts #17887: Pull request #9859 synchronize by renovate bot
May 20, 2024 19:15 13s
May 20, 2024 19:15 13s
Update Helm release mysql from 9.19.1 to v10 (helm/defectdojo/Chart.yaml) Detect Merge Conflicts #17886: Pull request #9776 synchronize by renovate bot
May 20, 2024 19:14 12s renovate/mysql-10.x
renovate/mysql-10.x
May 20, 2024 19:14 12s
Update Helm release mysql from 9.19.1 to v10 (helm/defectdojo/Chart.yaml) Detect Merge Conflicts #17885: Pull request #9776 synchronize by renovate bot
May 20, 2024 19:14 12s
May 20, 2024 19:14 12s
chore(deps): update helm release mysql from 9.19.1 to ~9.23.0 (helm/defectdojo/chart.yaml) Detect Merge Conflicts #17884: Pull request #9603 synchronize by renovate bot
May 20, 2024 19:12 2m 13s renovate/mysql-9.x
renovate/mysql-9.x
May 20, 2024 19:12 2m 13s
chore(deps): update helm release mysql from 9.19.1 to ~9.23.0 (helm/defectdojo/chart.yaml) Detect Merge Conflicts #17883: Pull request #9603 synchronize by renovate bot
May 20, 2024 19:12 2m 13s
May 20, 2024 19:12 2m 13s
Release: Merge back 2.34.4 into dev from: master-into-dev/2.34.4-2.35.0-dev Detect Merge Conflicts #17882: Pull request #10232 reopened by Maffooch
May 20, 2024 18:52 13s master-into-dev/2.34.4-2.35.0-dev
master-into-dev/2.34.4-2.35.0-dev
May 20, 2024 18:52 13s
Release: Merge back 2.34.4 into dev from: master-into-dev/2.34.4-2.35.0-dev Detect Merge Conflicts #17881: Pull request #10232 synchronize by Maffooch
May 20, 2024 18:41 12s master-into-dev/2.34.4-2.35.0-dev
master-into-dev/2.34.4-2.35.0-dev
May 20, 2024 18:41 12s
Release: Merge back 2.34.4 into dev from: master-into-dev/2.34.4-2.35.0-dev Detect Merge Conflicts #17880: Pull request #10232 synchronize by Maffooch
May 20, 2024 18:41 2m 11s
May 20, 2024 18:41 2m 11s
Release: Merge release into master from: release/2.34.4 Detect Merge Conflicts #17879: Pull request #10231 reopened by Maffooch
May 20, 2024 18:10 2m 11s release/2.34.4
release/2.34.4
May 20, 2024 18:10 2m 11s
Ruff: Add and fix Q000 Detect Merge Conflicts #17877: Pull request #10095 synchronize by kiblik
May 20, 2024 16:49 10s
May 20, 2024 16:49 10s
Ruff: Add and fix Q000 Detect Merge Conflicts #17878: Pull request #10095 synchronize by kiblik
May 20, 2024 16:49 15s kiblik:ruff_q000
kiblik:ruff_q000
May 20, 2024 16:49 15s
Ruff: Add and fix Q000 Detect Merge Conflicts #17876: Pull request #10095 synchronize by kiblik
May 20, 2024 16:44 12s kiblik:ruff_q000
kiblik:ruff_q000
May 20, 2024 16:44 12s
Ruff: Add and fix Q000 Detect Merge Conflicts #17875: Pull request #10095 synchronize by kiblik
May 20, 2024 16:44 13s
May 20, 2024 16:44 13s