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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Release: Merge back 2.40.2 into dev from: master-into-dev/2.40.2-2.41.0-dev Detect Merge Conflicts #21842: Pull request #11287 synchronize by rossops
November 18, 2024 17:06 10s master-into-dev/2.40.2-2.41.0-dev
master-into-dev/2.40.2-2.41.0-dev
November 18, 2024 17:06 10s
Release: Merge back 2.40.2 into dev from: master-into-dev/2.40.2-2.41.0-dev Detect Merge Conflicts #21841: Pull request #11287 synchronize by rossops
November 18, 2024 17:06 10s
November 18, 2024 17:06 10s
Release: Merge back 2.40.2 into dev from: master-into-dev/2.40.2-2.41.0-dev Detect Merge Conflicts #21840: Pull request #11287 synchronize by rossops
November 18, 2024 16:56 11s master-into-dev/2.40.2-2.41.0-dev
master-into-dev/2.40.2-2.41.0-dev
November 18, 2024 16:56 11s
Release: Merge back 2.40.2 into dev from: master-into-dev/2.40.2-2.41.0-dev Detect Merge Conflicts #21839: Pull request #11287 synchronize by rossops
November 18, 2024 16:56 12s
November 18, 2024 16:56 12s
Release: Merge back 2.40.2 into bugfix from: master-into-bugfix/2.40.2-2.41.0-dev Detect Merge Conflicts #21838: Pull request #11286 reopened by rossops
November 18, 2024 16:53 18s master-into-bugfix/2.40.2-2.41.0-dev
master-into-bugfix/2.40.2-2.41.0-dev
November 18, 2024 16:53 18s
Release: Merge release into master from: release/2.40.2 Detect Merge Conflicts #21837: Pull request #11285 synchronize by rossops
November 18, 2024 16:29 9s release/2.40.2
release/2.40.2
November 18, 2024 16:29 9s
Release: Merge release into master from: release/2.40.2 Detect Merge Conflicts #21836: Pull request #11285 synchronize by rossops
November 18, 2024 16:29 10s
November 18, 2024 16:29 10s
Add new Mend Platform API 3.0 file types to existing Mend parser Detect Merge Conflicts #21835: Pull request #11259 synchronize by testaccount90009
November 18, 2024 16:23 10s testaccount90009:dev
testaccount90009:dev
November 18, 2024 16:23 10s
Add new Mend Platform API 3.0 file types to existing Mend parser Detect Merge Conflicts #21834: Pull request #11259 synchronize by testaccount90009
November 18, 2024 16:23 12s
November 18, 2024 16:23 12s
Add new Mend Platform API 3.0 file types to existing Mend parser Detect Merge Conflicts #21833: Pull request #11259 synchronize by testaccount90009
November 18, 2024 16:19 11s testaccount90009:dev
testaccount90009:dev
November 18, 2024 16:19 11s
Add new Mend Platform API 3.0 file types to existing Mend parser Detect Merge Conflicts #21832: Pull request #11259 synchronize by testaccount90009
November 18, 2024 16:19 13s
November 18, 2024 16:19 13s
Release: Merge release into master from: release/2.40.2 Detect Merge Conflicts #21831: Pull request #11285 reopened by rossops
November 18, 2024 16:05 18s release/2.40.2
release/2.40.2
November 18, 2024 16:05 18s
HCL AppScan on Cloud SAST results parser Detect Merge Conflicts #21830: Pull request #11173 synchronize by xpert98
November 18, 2024 13:54 16s
November 18, 2024 13:54 16s
Bump openapitools/openapi-generator-cli from v7.9.0 to v7.10.0 Detect Merge Conflicts #21829: Pull request #11283 opened by dependabot bot
November 18, 2024 13:05 26s dependabot/docker/dev/openapitools/openapi-generator-cli-v7.10.0
dependabot/docker/dev/openapitools/openapi-generator-cli-v7.10.0
November 18, 2024 13:05 26s
Bump nginx from 2140dad to 74175cf Detect Merge Conflicts #21828: Pull request #11282 opened by dependabot bot
November 18, 2024 13:05 26s dependabot/docker/dev/nginx-74175cf
dependabot/docker/dev/nginx-74175cf
November 18, 2024 13:05 26s
Bump boto3 from 1.35.62 to 1.35.63 Detect Merge Conflicts #21827: Pull request #11281 opened by dependabot bot
November 18, 2024 12:38 11s dependabot/pip/dev/boto3-1.35.63
dependabot/pip/dev/boto3-1.35.63
November 18, 2024 12:38 11s
Bump pyjwt from 2.9.0 to 2.10.0 Detect Merge Conflicts #21826: Pull request #11280 opened by dependabot bot
November 18, 2024 12:38 11s dependabot/pip/dev/pyjwt-2.10.0
dependabot/pip/dev/pyjwt-2.10.0
November 18, 2024 12:38 11s
🎉 Add Trivy Operator clustercompliance report Detect Merge Conflicts #21825: Pull request #11279 synchronize by manuel-sommer
November 18, 2024 08:59 10s manuel-sommer:trivy_clustercompliancereport
manuel-sommer:trivy_clustercompliancereport
November 18, 2024 08:59 10s
🎉 Add Trivy Operator clustercompliance report Detect Merge Conflicts #21824: Pull request #11279 synchronize by manuel-sommer
November 18, 2024 08:59 14s
November 18, 2024 08:59 14s
🎉 Add Trivy Operator clustercompliance report Detect Merge Conflicts #21823: Pull request #11279 opened by manuel-sommer
November 18, 2024 08:46 2m 14s manuel-sommer:trivy_clustercompliancereport
manuel-sommer:trivy_clustercompliancereport
November 18, 2024 08:46 2m 14s
Mobsfscan report files parsing fix Detect Merge Conflicts #21822: Pull request #11278 synchronize by dmarushkin
November 17, 2024 22:29 10s dmarushkin:mobsfscan_report_fix
dmarushkin:mobsfscan_report_fix
November 17, 2024 22:29 10s
Mobsfscan report files parsing fix Detect Merge Conflicts #21821: Pull request #11278 synchronize by dmarushkin
November 17, 2024 22:29 10s
November 17, 2024 22:29 10s
Mobsfscan report files parsing fix Detect Merge Conflicts #21820: Pull request #11278 synchronize by dmarushkin
November 17, 2024 22:16 12s dmarushkin:mobsfscan_report_fix
dmarushkin:mobsfscan_report_fix
November 17, 2024 22:16 12s
Mobsfscan report files parsing fix Detect Merge Conflicts #21819: Pull request #11278 synchronize by dmarushkin
November 17, 2024 22:16 10s
November 17, 2024 22:16 10s
Mobsfscan report files parsing fix Detect Merge Conflicts #21818: Pull request #11278 opened by dmarushkin
November 17, 2024 22:15 10s dmarushkin:mobsfscan_report_fix
dmarushkin:mobsfscan_report_fix
November 17, 2024 22:15 10s
ProTip! You can narrow down the results and go further in time using created:<2024-11-17 or the other filters available.