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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Bump pdfmake from 0.2.17 to 0.2.18 in /components Detect Merge Conflicts #22573: Pull request #11485 opened by dependabot bot
January 1, 2025 12:50 13s dependabot/npm_and_yarn/components/dev/pdfmake-0.2.18
dependabot/npm_and_yarn/components/dev/pdfmake-0.2.18
January 1, 2025 12:50 13s
Add pro release notes for 2.41.4 Detect Merge Conflicts #22572: Pull request #11483 synchronize by paulOsinski
December 31, 2024 18:20 18s paulOsinski:2.41.4-notes
paulOsinski:2.41.4-notes
December 31, 2024 18:20 18s
Add pro release notes for 2.41.4 Detect Merge Conflicts #22571: Pull request #11483 synchronize by paulOsinski
December 31, 2024 18:20 11s
December 31, 2024 18:20 11s
Docs maintenance - v2.41.4 Detect Merge Conflicts #22570: Pull request #11484 synchronize by paulOsinski
December 31, 2024 18:08 10s paulOsinski:xmas-docs-updates
paulOsinski:xmas-docs-updates
December 31, 2024 18:08 10s
Docs maintenance - v2.41.4 Detect Merge Conflicts #22569: Pull request #11484 synchronize by paulOsinski
December 31, 2024 18:08 14s
December 31, 2024 18:08 14s
Docs maintenance - v2.41.4 Detect Merge Conflicts #22568: Pull request #11484 synchronize by paulOsinski
December 31, 2024 17:49 10s paulOsinski:xmas-docs-updates
paulOsinski:xmas-docs-updates
December 31, 2024 17:49 10s
Docs maintenance - v2.41.4 Detect Merge Conflicts #22567: Pull request #11484 synchronize by paulOsinski
December 31, 2024 17:49 9s
December 31, 2024 17:49 9s
Docs maintenance - v2.41.4 Detect Merge Conflicts #22566: Pull request #11484 opened by paulOsinski
December 31, 2024 17:49 2m 10s paulOsinski:xmas-docs-updates
paulOsinski:xmas-docs-updates
December 31, 2024 17:49 2m 10s
Add pro release notes for 2.41.4 Detect Merge Conflicts #22565: Pull request #11483 opened by paulOsinski
December 31, 2024 17:04 10s paulOsinski:2.41.4-notes
paulOsinski:2.41.4-notes
December 31, 2024 17:04 10s
Notes on Findings for Simple Risk Acceptance Detect Merge Conflicts #22564: Pull request #11482 opened by hblankenship
December 31, 2024 16:04 14s hb-notes-risk-accept
hb-notes-risk-accept
December 31, 2024 16:04 14s
Bump vcrpy from 6.0.2 to 7.0.0 Detect Merge Conflicts #22563: Pull request #11481 opened by dependabot bot
December 31, 2024 12:18 2m 13s dependabot/pip/dev/vcrpy-7.0.0
dependabot/pip/dev/vcrpy-7.0.0
December 31, 2024 12:18 2m 13s
Update JIRA for Finding Group When Risk Acceptance Expires Detect Merge Conflicts #22562: Pull request #11401 synchronize by hblankenship
December 30, 2024 17:20 9s hb-jira-risk-acceptance
hb-jira-risk-acceptance
December 30, 2024 17:20 9s
Update JIRA for Finding Group When Risk Acceptance Expires Detect Merge Conflicts #22561: Pull request #11401 synchronize by hblankenship
December 30, 2024 17:20 12s
December 30, 2024 17:20 12s
Update JIRA for Finding Group When Risk Acceptance Expires Detect Merge Conflicts #22560: Pull request #11401 synchronize by hblankenship
December 30, 2024 17:19 2m 10s hb-jira-risk-acceptance
hb-jira-risk-acceptance
December 30, 2024 17:19 2m 10s
Update JIRA for Finding Group When Risk Acceptance Expires Detect Merge Conflicts #22559: Pull request #11401 synchronize by hblankenship
December 30, 2024 17:19 2m 12s
December 30, 2024 17:19 2m 12s
Release: Merge back 2.41.4 into bugfix from: master-into-bugfix/2.41.4-2.42.0-dev Detect Merge Conflicts #22558: Pull request #11479 reopened by rossops
December 30, 2024 15:59 11s master-into-bugfix/2.41.4-2.42.0-dev
master-into-bugfix/2.41.4-2.42.0-dev
December 30, 2024 15:59 11s
Release: Merge back 2.41.4 into dev from: master-into-dev/2.41.4-2.42.0-dev Detect Merge Conflicts #22556: Pull request #11478 synchronize by rossops
December 30, 2024 15:58 13s master-into-dev/2.41.4-2.42.0-dev
master-into-dev/2.41.4-2.42.0-dev
December 30, 2024 15:58 13s
Release: Merge back 2.41.4 into dev from: master-into-dev/2.41.4-2.42.0-dev Detect Merge Conflicts #22557: Pull request #11478 synchronize by rossops
December 30, 2024 15:58 13s
December 30, 2024 15:58 13s
Release: Merge release into master from: release/2.41.4 Detect Merge Conflicts #22555: Pull request #11477 synchronize by rossops
December 30, 2024 15:33 14s release/2.41.4
release/2.41.4
December 30, 2024 15:33 14s
Release: Merge release into master from: release/2.41.4 Detect Merge Conflicts #22554: Pull request #11477 synchronize by rossops
December 30, 2024 15:33 14s
December 30, 2024 15:33 14s
Update JIRA for Finding Group When Risk Acceptance Expires Detect Merge Conflicts #22553: Pull request #11401 synchronize by hblankenship
December 30, 2024 14:17 11s hb-jira-risk-acceptance
hb-jira-risk-acceptance
December 30, 2024 14:17 11s
Update JIRA for Finding Group When Risk Acceptance Expires Detect Merge Conflicts #22552: Pull request #11401 synchronize by hblankenship
December 30, 2024 14:17 8s
December 30, 2024 14:17 8s
Bump boto3 from 1.35.88 to 1.35.90 Detect Merge Conflicts #22551: Pull request #11476 opened by dependabot bot
December 30, 2024 12:58 9s dependabot/pip/dev/boto3-1.35.90
dependabot/pip/dev/boto3-1.35.90
December 30, 2024 12:58 9s
Bump python-gitlab from 5.2.0 to 5.3.0 Detect Merge Conflicts #22550: Pull request #11475 opened by dependabot bot
December 30, 2024 12:58 2m 12s dependabot/pip/dev/python-gitlab-5.3.0
dependabot/pip/dev/python-gitlab-5.3.0
December 30, 2024 12:58 2m 12s
Make links in the login page visually obvious Detect Merge Conflicts #22549: Pull request #11474 opened by oussama-taoufiq
December 27, 2024 16:07 2m 12s oussama-taoufiq:accessibility-issues
oussama-taoufiq:accessibility-issues
December 27, 2024 16:07 2m 12s