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
8,783 workflow run results
8,783 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Fix for issue #10207 non-existent env import Detect Merge Conflicts #20951: Pull request #11053 synchronize by hblankenship
October 15, 2024 23:20 10s
October 15, 2024 23:20 10s
Fix for issue #10207 non-existent env import Detect Merge Conflicts #20950: Pull request #11053 synchronize by hblankenship
October 15, 2024 23:15 11s hb-fix-environ-on-import
hb-fix-environ-on-import
October 15, 2024 23:15 11s
Fix for issue #10207 non-existent env import Detect Merge Conflicts #20949: Pull request #11053 synchronize by hblankenship
October 15, 2024 23:15 10s
October 15, 2024 23:15 10s
Fix for issue #10207 non-existent env import Detect Merge Conflicts #20948: Pull request #11053 synchronize by hblankenship
October 15, 2024 22:41 11s hb-fix-environ-on-import
hb-fix-environ-on-import
October 15, 2024 22:41 11s
Fix for issue #10207 non-existent env import Detect Merge Conflicts #20947: Pull request #11053 synchronize by hblankenship
October 15, 2024 22:41 10s
October 15, 2024 22:41 10s
fix(helm): set cloudsql-proxy as sidecar container to allow initializer and dbmigration to run Detect Merge Conflicts #20946: Pull request #10824 synchronize by jndeverteuil
October 15, 2024 20:37 19s jndeverteuil:cloudsql-proxy-sidecar
jndeverteuil:cloudsql-proxy-sidecar
October 15, 2024 20:37 19s
fix(helm): set cloudsql-proxy as sidecar container to allow initializer and dbmigration to run Detect Merge Conflicts #20945: Pull request #10824 synchronize by jndeverteuil
October 15, 2024 20:37 15s
October 15, 2024 20:37 15s
Refactor mobsf parser for v4 reports Detect Merge Conflicts #20944: Pull request #11056 synchronize by dmarushkin
October 15, 2024 20:21 13s dmarushkin:fix_parser_for_mobsf4
dmarushkin:fix_parser_for_mobsf4
October 15, 2024 20:21 13s
Refactor mobsf parser for v4 reports Detect Merge Conflicts #20943: Pull request #11056 synchronize by dmarushkin
October 15, 2024 20:21 11s
October 15, 2024 20:21 11s
Refactor mobsf parser for v4 reports Detect Merge Conflicts #20941: Pull request #11056 synchronize by dmarushkin
October 15, 2024 16:41 13s
October 15, 2024 16:41 13s
Refactor mobsf parser for v4 reports Detect Merge Conflicts #20939: Pull request #11056 synchronize by dmarushkin
October 15, 2024 16:41 13s
October 15, 2024 16:41 13s
Bump python from 3.11.9-slim-bookworm to 3.13.0-slim-bookworm Detect Merge Conflicts #20938: Pull request #11061 synchronize by dependabot bot
October 15, 2024 16:39 2m 16s dependabot/docker/dev/python-3.13.0-slim-bookworm
dependabot/docker/dev/python-3.13.0-slim-bookworm
October 15, 2024 16:39 2m 16s
Bump python from 3.11.9-slim-bookworm to 3.13.0-slim-bookworm Detect Merge Conflicts #20937: Pull request #11061 synchronize by dependabot bot
October 15, 2024 16:39 2m 13s
October 15, 2024 16:39 2m 13s
🎉 ADD ELSA errata Detect Merge Conflicts #20936: Pull request #11069 synchronize by manuel-sommer
October 15, 2024 16:27 11s manuel-sommer:add_elsa
manuel-sommer:add_elsa
October 15, 2024 16:27 11s
🎉 ADD ELSA errata Detect Merge Conflicts #20935: Pull request #11069 synchronize by manuel-sommer
October 15, 2024 16:27 13s
October 15, 2024 16:27 13s
💄 Advance architecture docs Detect Merge Conflicts #20934: Pull request #11074 synchronize by manuel-sommer
October 15, 2024 16:13 13s manuel-sommer:advance_architecture
manuel-sommer:advance_architecture
October 15, 2024 16:13 13s
💄 Advance architecture docs Detect Merge Conflicts #20933: Pull request #11074 synchronize by manuel-sommer
October 15, 2024 16:13 16s
October 15, 2024 16:13 16s
Release: Merge back 2.39.1 into dev from: master-into-dev/2.39.1-2.40.0-dev Detect Merge Conflicts #20932: Pull request #11076 synchronize by rossops
October 15, 2024 16:13 11s master-into-dev/2.39.1-2.40.0-dev
master-into-dev/2.39.1-2.40.0-dev
October 15, 2024 16:13 11s
Release: Merge back 2.39.1 into dev from: master-into-dev/2.39.1-2.40.0-dev Detect Merge Conflicts #20931: Pull request #11076 synchronize by rossops
October 15, 2024 16:13 12s
October 15, 2024 16:13 12s
Release: Merge back 2.39.1 into bugfix from: master-into-bugfix/2.39.1-2.40.0-dev Detect Merge Conflicts #20930: Pull request #11075 reopened by rossops
October 15, 2024 16:12 11s master-into-bugfix/2.39.1-2.40.0-dev
master-into-bugfix/2.39.1-2.40.0-dev
October 15, 2024 16:12 11s
💄 Advance architecture docs Detect Merge Conflicts #20929: Pull request #11074 opened by manuel-sommer
October 15, 2024 16:04 2m 14s manuel-sommer:advance_architecture
manuel-sommer:advance_architecture
October 15, 2024 16:04 2m 14s
Release: Merge release into master from: release/2.39.1 Detect Merge Conflicts #20928: Pull request #11073 reopened by rossops
October 15, 2024 15:31 2m 15s release/2.39.1
release/2.39.1
October 15, 2024 15:31 2m 15s
Update support text and buttons Detect Merge Conflicts #20927: Pull request #11051 synchronize by Maffooch
October 15, 2024 14:44 12s hb-update-support
hb-update-support
October 15, 2024 14:44 12s
Update support text and buttons Detect Merge Conflicts #20926: Pull request #11051 synchronize by Maffooch
October 15, 2024 14:44 13s
October 15, 2024 14:44 13s
Bump boto3 from 1.35.38 to 1.35.40 Detect Merge Conflicts #20925: Pull request #11071 opened by dependabot bot
October 15, 2024 12:17 15s dependabot/pip/dev/boto3-1.35.40
dependabot/pip/dev/boto3-1.35.40
October 15, 2024 12:17 15s