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
2,204 workflow run results
2,204 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Release: Merge release into master from: release/2.31.0 Detect Merge Conflicts #14634: Pull request #9483 reopened by Maffooch
February 5, 2024 21:58 2m 15s release/3.31.0
release/3.31.0
February 5, 2024 21:58 2m 15s
Dojo_Group: Support for "RemoteUser" in model Detect Merge Conflicts #14633: Pull request #9405 reopened by kiblik
February 5, 2024 21:16 14s kiblik:remote_user_correct_name
kiblik:remote_user_correct_name
February 5, 2024 21:16 14s
Merge Bugfix Into Dev: 2.31.0 Detect Merge Conflicts #14632: Pull request #9482 synchronize by Maffooch
February 5, 2024 21:05 8m 21s bugfix
bugfix
February 5, 2024 21:05 8m 21s
Merge Bugfix Into Dev: 2.31.0 Detect Merge Conflicts #14631: Pull request #9482 synchronize by Maffooch
February 5, 2024 21:05 8m 14s
February 5, 2024 21:05 8m 14s
Dojo_Group: Support for "RemoteUser" in model Detect Merge Conflicts #14630: Pull request #9405 synchronize by kiblik
February 5, 2024 21:03 9m 53s kiblik:remote_user_correct_name
kiblik:remote_user_correct_name
February 5, 2024 21:03 9m 53s
Dojo_Group: Support for "RemoteUser" in model Detect Merge Conflicts #14629: Pull request #9405 synchronize by kiblik
February 5, 2024 21:03 11m 24s
February 5, 2024 21:03 11m 24s
Merge Bugfix Into Dev: 2.31.0 Detect Merge Conflicts #14628: Pull request #9482 opened by Maffooch
February 5, 2024 20:54 16s bugfix
bugfix
February 5, 2024 20:54 16s
Update dependency postcss from 8.4.33 to v8.4.34 (docs/package.json) Detect Merge Conflicts #14627: Pull request #9481 opened by renovate bot
February 5, 2024 20:53 2m 12s renovate/postcss-8.x
renovate/postcss-8.x
February 5, 2024 20:53 2m 12s
✨ merge veracode Detect Merge Conflicts #14625: Pull request #9468 synchronize by manuel-sommer
February 5, 2024 20:36 13s
February 5, 2024 20:36 13s
✨ merge veracode Detect Merge Conflicts #14626: Pull request #9468 synchronize by manuel-sommer
February 5, 2024 20:36 15s manuel-sommer:merge_veracode
manuel-sommer:merge_veracode
February 5, 2024 20:36 15s
✨ merge veracode Detect Merge Conflicts #14624: Pull request #9468 synchronize by manuel-sommer
February 5, 2024 19:49 13s manuel-sommer:merge_veracode
manuel-sommer:merge_veracode
February 5, 2024 19:49 13s
✨ merge veracode Detect Merge Conflicts #14623: Pull request #9468 synchronize by manuel-sommer
February 5, 2024 19:49 16s
February 5, 2024 19:49 16s
finding sla expiration date field (part one) Detect Merge Conflicts #14621: Pull request #9473 synchronize by blakeaowens
February 5, 2024 17:52 11s blakeaowens:sla-expiration-date-part-1
blakeaowens:sla-expiration-date-part-1
February 5, 2024 17:52 11s
finding sla expiration date field (part one) Detect Merge Conflicts #14622: Pull request #9473 synchronize by blakeaowens
February 5, 2024 17:52 10s
February 5, 2024 17:52 10s
finding sla expiration date field (part one) Detect Merge Conflicts #14620: Pull request #9473 synchronize by blakeaowens
February 5, 2024 17:52 2m 16s blakeaowens:sla-expiration-date-part-1
blakeaowens:sla-expiration-date-part-1
February 5, 2024 17:52 2m 16s
finding sla expiration date field (part one) Detect Merge Conflicts #14619: Pull request #9473 synchronize by blakeaowens
February 5, 2024 17:52 2m 17s
February 5, 2024 17:52 2m 17s
API: removal of drf_yasg (OpenAPI 2.0 Swagger) Detect Merge Conflicts #14617: Pull request #9108 synchronize by kiblik
February 5, 2024 15:21 2m 14s
February 5, 2024 15:21 2m 14s
API: removal of drf_yasg (OpenAPI 2.0 Swagger) Detect Merge Conflicts #14618: Pull request #9108 synchronize by kiblik
February 5, 2024 15:21 2m 16s kiblik:api_remove_drf_yasg
kiblik:api_remove_drf_yasg
February 5, 2024 15:21 2m 16s
🐛 Yarn Audit: Add CI importer support Detect Merge Conflicts #14616: Pull request #9478 opened by manuel-sommer
February 5, 2024 14:04 12s manuel-sommer:fix_yarnaudit_issue6495
manuel-sommer:fix_yarnaudit_issue6495
February 5, 2024 14:04 12s
Bump nginx from d12e6f7 to f2802c2 Detect Merge Conflicts #14615: Pull request #9477 opened by dependabot bot
February 5, 2024 12:35 9s dependabot/docker/dev/nginx-f2802c2
dependabot/docker/dev/nginx-f2802c2
February 5, 2024 12:35 9s
Bump boto3 from 1.34.32 to 1.34.34 Detect Merge Conflicts #14614: Pull request #9476 opened by dependabot bot
February 5, 2024 12:15 11s dependabot/pip/dev/boto3-1.34.34
dependabot/pip/dev/boto3-1.34.34
February 5, 2024 12:15 11s
Bump mysqlclient from 2.1.1 to 2.2.3 Detect Merge Conflicts #14613: Pull request #9475 opened by dependabot bot
February 5, 2024 12:15 10s dependabot/pip/dev/mysqlclient-2.2.3
dependabot/pip/dev/mysqlclient-2.2.3
February 5, 2024 12:15 10s
finding sla expiration date field (part one) Detect Merge Conflicts #14612: Pull request #9473 synchronize by blakeaowens
February 5, 2024 02:54 10s blakeaowens:sla-expiration-date-part-1
blakeaowens:sla-expiration-date-part-1
February 5, 2024 02:54 10s
finding sla expiration date field (part one) Detect Merge Conflicts #14611: Pull request #9473 synchronize by blakeaowens
February 5, 2024 02:54 11s
February 5, 2024 02:54 11s
finding sla expiration date field (part one) Detect Merge Conflicts #14610: Pull request #9473 opened by blakeaowens
February 5, 2024 02:51 13s blakeaowens:sla-expiration-date-part-1
blakeaowens:sla-expiration-date-part-1
February 5, 2024 02:51 13s