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
93 workflow run results
93 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

add parser formatting to bandit.md Detect Merge Conflicts #12262: Pull request #8757 opened by paulOsinski
September 28, 2023 23:42 11s paulOsinski:bandit
paulOsinski:bandit
September 28, 2023 23:42 11s
update parser template on awssecurityhub.md Detect Merge Conflicts #12261: Pull request #8756 opened by paulOsinski
September 28, 2023 23:06 14m 51s paulOsinski:aws-security-hub
paulOsinski:aws-security-hub
September 28, 2023 23:06 14m 51s
Temporarily pin versions of chrome and chrome webdriver Detect Merge Conflicts #12260: Pull request #8755 opened by dwalleck
September 28, 2023 23:00 20m 20s dwalleck:pin-chrome-bugfix
dwalleck:pin-chrome-bugfix
September 28, 2023 23:00 20m 20s
Update dependency postcss from 8.4.30 to v8.4.31 (docs/package.json) Detect Merge Conflicts #12258: Pull request #8753 synchronize by renovate bot
September 28, 2023 22:41 12s
September 28, 2023 22:41 12s
Update dependency postcss from 8.4.30 to v8.4.31 (docs/package.json) Detect Merge Conflicts #12259: Pull request #8753 synchronize by renovate bot
September 28, 2023 22:41 11s renovate/postcss-8.x
renovate/postcss-8.x
September 28, 2023 22:41 11s
Bump psycopg2-binary from 2.9.7 to 2.9.8 Detect Merge Conflicts #12257: Pull request #8747 synchronize by dependabot bot
September 28, 2023 22:39 13s dependabot/pip/dev/psycopg2-binary-2.9.8
dependabot/pip/dev/psycopg2-binary-2.9.8
September 28, 2023 22:39 13s
Bump psycopg2-binary from 2.9.7 to 2.9.8 Detect Merge Conflicts #12256: Pull request #8747 synchronize by dependabot bot
September 28, 2023 22:39 14s
September 28, 2023 22:39 14s
Bump django-imagekit from 4.1.0 to 5.0.0 Detect Merge Conflicts #12254: Pull request #8748 synchronize by dependabot bot
September 28, 2023 22:39 11s dependabot/pip/dev/django-imagekit-5.0.0
dependabot/pip/dev/django-imagekit-5.0.0
September 28, 2023 22:39 11s
Bump django-imagekit from 4.1.0 to 5.0.0 Detect Merge Conflicts #12255: Pull request #8748 synchronize by dependabot bot
September 28, 2023 22:39 15s
September 28, 2023 22:39 15s
Bump boto3 from 1.28.55 to 1.28.57 Detect Merge Conflicts #12253: Pull request #8754 opened by dependabot bot
September 28, 2023 22:39 2m 12s dependabot/pip/dev/boto3-1.28.57
dependabot/pip/dev/boto3-1.28.57
September 28, 2023 22:39 2m 12s
Update dependency postcss from 8.4.30 to v8.4.31 (docs/package.json) Detect Merge Conflicts #12252: Pull request #8753 opened by renovate bot
September 28, 2023 22:38 2m 12s renovate/postcss-8.x
renovate/postcss-8.x
September 28, 2023 22:38 2m 12s
Temporarily pin the versions of chrome and chrome webdriver Detect Merge Conflicts #12251: Pull request #8752 opened by dwalleck
September 28, 2023 21:23 2m 17s dwalleck:pin-chrome-versions
dwalleck:pin-chrome-versions
September 28, 2023 21:23 2m 17s
Bump boto3 from 1.28.55 to 1.28.56 Detect Merge Conflicts #12250: Pull request #8749 opened by dependabot bot
September 28, 2023 12:41 16s dependabot/pip/dev/boto3-1.28.56
dependabot/pip/dev/boto3-1.28.56
September 28, 2023 12:41 16s
Added Preprocessing Script for Wazuh API and Modified Wazuh Parser Detect Merge Conflicts #12248: Pull request #8746 synchronize by ghost
September 28, 2023 12:41 17s
September 28, 2023 12:41 17s
Added Preprocessing Script for Wazuh API and Modified Wazuh Parser Detect Merge Conflicts #12249: Pull request #8746 synchronize by ghost
September 28, 2023 12:41 2m 15s update/wazuh-parser
update/wazuh-parser
September 28, 2023 12:41 2m 15s
Bump django-imagekit from 4.1.0 to 5.0.0 Detect Merge Conflicts #12247: Pull request #8748 opened by dependabot bot
September 28, 2023 12:41 11s dependabot/pip/dev/django-imagekit-5.0.0
dependabot/pip/dev/django-imagekit-5.0.0
September 28, 2023 12:41 11s
Added Preprocessing Script for Wazuh API and Modified Wazuh Parser Detect Merge Conflicts #12245: Pull request #8746 synchronize by ghost
September 28, 2023 12:41 14s
September 28, 2023 12:41 14s
Bump psycopg2-binary from 2.9.7 to 2.9.8 Detect Merge Conflicts #12244: Pull request #8747 opened by dependabot bot
September 28, 2023 12:41 12s dependabot/pip/dev/psycopg2-binary-2.9.8
dependabot/pip/dev/psycopg2-binary-2.9.8
September 28, 2023 12:41 12s
Docs: Fix "data model" link in Features Detect Merge Conflicts #12242: Pull request #8744 opened by kiblik
September 28, 2023 08:23 14s kiblik:doc_features_models
kiblik:doc_features_models
September 28, 2023 08:23 14s
Update govulncheck parser to new format Detect Merge Conflicts #12241: Pull request #8743 opened by FelixHernandez
September 28, 2023 05:29 2m 18s sc-1976
sc-1976
September 28, 2023 05:29 2m 18s
Sanitization + Modernization: Findings, Groups, Notifications Detect Merge Conflicts #12239: Pull request #8728 synchronize by Maffooch
September 27, 2023 22:10 13s
September 27, 2023 22:10 13s
Sanitization + Modernization: Findings, Groups, Notifications Detect Merge Conflicts #12240: Pull request #8728 synchronize by Maffooch
September 27, 2023 22:10 14s Maffooch:class-views
Maffooch:class-views
September 27, 2023 22:10 14s
Sanitization + Modernization: Findings, Groups, Notifications Detect Merge Conflicts #12238: Pull request #8728 synchronize by Maffooch
September 27, 2023 22:07 17s Maffooch:class-views
Maffooch:class-views
September 27, 2023 22:07 17s
Sanitization + Modernization: Findings, Groups, Notifications Detect Merge Conflicts #12237: Pull request #8728 synchronize by Maffooch
September 27, 2023 22:07 17s
September 27, 2023 22:07 17s
Update ASFF parser to create endpoints Detect Merge Conflicts #12235: Pull request #8742 synchronize by ghost
September 27, 2023 19:28 13s
September 27, 2023 19:28 13s