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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Update rabbitmq:3.12.12-alpine Docker digest from 3.12.12 to 3.12.12-alpine (docker-compose.yml) Detect Merge Conflicts #14923: Pull request #9535 synchronize by renovate bot
February 13, 2024 19:18 11s renovate/rabbitmq-3.12.12-alpine
renovate/rabbitmq-3.12.12-alpine
February 13, 2024 19:18 11s
Update rabbitmq:3.12.12-alpine Docker digest from 3.12.12 to 3.12.12-alpine (docker-compose.yml) Detect Merge Conflicts #14922: Pull request #9535 synchronize by renovate bot
February 13, 2024 19:18 12s
February 13, 2024 19:18 12s
Remove flot-axis JS library Detect Merge Conflicts #14921: Pull request #9540 opened by FelixHernandez
February 13, 2024 15:43 16s sc-2602
sc-2602
February 13, 2024 15:43 16s
Update rabbitmq:3.12.12-alpine Docker digest from 3.12.12 to 3.12.12-alpine (docker-compose.yml) Detect Merge Conflicts #14920: Pull request #9535 synchronize by renovate bot
February 13, 2024 15:21 13s renovate/rabbitmq-3.12.12-alpine
renovate/rabbitmq-3.12.12-alpine
February 13, 2024 15:21 13s
Update rabbitmq:3.12.12-alpine Docker digest from 3.12.12 to 3.12.12-alpine (docker-compose.yml) Detect Merge Conflicts #14919: Pull request #9535 synchronize by renovate bot
February 13, 2024 15:21 13s
February 13, 2024 15:21 13s
Fix "Overdue" tag still visible with closed issues Detect Merge Conflicts #14918: Pull request #9539 opened by FelixHernandez
February 13, 2024 15:18 15s sc-2740
sc-2740
February 13, 2024 15:18 15s
🐛 fix issue #8096 Detect Merge Conflicts #14917: Pull request #9538 opened by manuel-sommer
February 13, 2024 10:48 15s manuel-sommer:fix_sonarqubeissue_8096
manuel-sommer:fix_sonarqubeissue_8096
February 13, 2024 10:48 15s
API: removal of drf_yasg (OpenAPI 2.0 Swagger) Detect Merge Conflicts #14916: Pull request #9108 reopened by kiblik
February 13, 2024 09:04 15s kiblik:api_remove_drf_yasg
kiblik:api_remove_drf_yasg
February 13, 2024 09:04 15s
Dev Detect Merge Conflicts #14914: Pull request #9537 synchronize by TheRedHatter
February 13, 2024 08:51 15s
February 13, 2024 08:51 15s
Update postgres Docker tag from 16.1 to v16.2 (docker-compose.yml) Detect Merge Conflicts #14913: Pull request #9536 opened by renovate bot
February 13, 2024 04:20 10s renovate/postgres-16.x
renovate/postgres-16.x
February 13, 2024 04:20 10s
Update rabbitmq:3.12.12-alpine Docker digest from 3.12.12 to 3.12.12-alpine (docker-compose.yml) Detect Merge Conflicts #14912: Pull request #9535 opened by renovate bot
February 13, 2024 04:20 11s renovate/rabbitmq-3.12.12-alpine
renovate/rabbitmq-3.12.12-alpine
February 13, 2024 04:20 11s
API: removal of drf_yasg (OpenAPI 2.0 Swagger) Detect Merge Conflicts #14911: Pull request #9108 synchronize by kiblik
February 12, 2024 22:56 2m 16s kiblik:api_remove_drf_yasg
kiblik:api_remove_drf_yasg
February 12, 2024 22:56 2m 16s
API: removal of drf_yasg (OpenAPI 2.0 Swagger) Detect Merge Conflicts #14910: Pull request #9108 synchronize by kiblik
February 12, 2024 22:56 2m 18s
February 12, 2024 22:56 2m 18s
Dojo_Group: Support for "RemoteUser" in model Detect Merge Conflicts #14909: Pull request #9405 synchronize by Maffooch
February 12, 2024 20:42 2m 14s kiblik:remote_user_correct_name
kiblik:remote_user_correct_name
February 12, 2024 20:42 2m 14s
Dojo_Group: Support for "RemoteUser" in model Detect Merge Conflicts #14908: Pull request #9405 synchronize by Maffooch
February 12, 2024 20:42 2m 17s
February 12, 2024 20:42 2m 17s
Release: Merge back 2.31.1 into dev from: master-into-dev/2.31.1-2.32.0-dev Detect Merge Conflicts #14907: Pull request #9534 synchronize by Maffooch
February 12, 2024 20:16 2m 12s master-into-dev/2.31.1-2.32.0-dev
master-into-dev/2.31.1-2.32.0-dev
February 12, 2024 20:16 2m 12s
Release: Merge back 2.31.1 into dev from: master-into-dev/2.31.1-2.32.0-dev Detect Merge Conflicts #14906: Pull request #9534 synchronize by Maffooch
February 12, 2024 20:16 13s
February 12, 2024 20:16 13s
Release: Merge release into master from: release/2.31.1 Detect Merge Conflicts #14905: Pull request #9532 synchronize by Maffooch
February 12, 2024 19:36 2m 12s release/2.31.1
release/2.31.1
February 12, 2024 19:36 2m 12s
Release: Merge release into master from: release/2.31.1 Detect Merge Conflicts #14904: Pull request #9532 synchronize by Maffooch
February 12, 2024 19:36 13s
February 12, 2024 19:36 13s
Engagement Surveys: Add missing leading slash Detect Merge Conflicts #14903: Pull request #9531 opened by Maffooch
February 12, 2024 18:49 3m 13s Maffooch-patch-5
Maffooch-patch-5
February 12, 2024 18:49 3m 13s
Disallow duplicate tool types Detect Merge Conflicts #14901: Pull request #9530 synchronize by Maffooch
February 12, 2024 18:41 11s
February 12, 2024 18:41 11s
Disallow duplicate tool types Detect Merge Conflicts #14902: Pull request #9530 synchronize by Maffooch
February 12, 2024 18:41 14s Maffooch:tools
Maffooch:tools
February 12, 2024 18:41 14s
Disallow duplicate tool types Detect Merge Conflicts #14900: Pull request #9530 synchronize by Maffooch
February 12, 2024 18:13 45s Maffooch:tools
Maffooch:tools
February 12, 2024 18:13 45s
Disallow duplicate tool types Detect Merge Conflicts #14899: Pull request #9530 synchronize by Maffooch
February 12, 2024 18:13 46s
February 12, 2024 18:13 46s
Disallow duplicate tool types Detect Merge Conflicts #14898: Pull request #9530 synchronize by Maffooch
February 12, 2024 17:40 11s Maffooch:tools
Maffooch:tools
February 12, 2024 17:40 11s