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
10,337 workflow runs
10,337 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Notifications: Convert to classes Detect Merge Conflicts #22390: Pull request #11296 synchronize by Maffooch
December 17, 2024 00:21 2m 9s
December 17, 2024 00:21 2m 9s
Bump pycurl from 7.45.3 to 7.45.4 Detect Merge Conflicts #22389: Pull request #11417 synchronize by dependabot bot
December 16, 2024 23:55 14s dependabot/pip/dev/pycurl-7.45.4
dependabot/pip/dev/pycurl-7.45.4
December 16, 2024 23:55 14s
Bump pycurl from 7.45.3 to 7.45.4 Detect Merge Conflicts #22388: Pull request #11417 synchronize by dependabot bot
December 16, 2024 23:55 2m 11s
December 16, 2024 23:55 2m 11s
Bump pycurl from 7.45.3 to 7.45.4 Detect Merge Conflicts #22387: Pull request #11417 synchronize by dependabot bot
December 16, 2024 23:54 2m 10s dependabot/pip/dev/pycurl-7.45.4
dependabot/pip/dev/pycurl-7.45.4
December 16, 2024 23:54 2m 10s
Bump pycurl from 7.45.3 to 7.45.4 Detect Merge Conflicts #22386: Pull request #11417 synchronize by dependabot bot
December 16, 2024 23:54 2m 11s
December 16, 2024 23:54 2m 11s
chore(deps): update helm release redis from 19.6.4 to v20 (helm/defectdojo/chart.yaml) Detect Merge Conflicts #22385: Pull request #10736 synchronize by renovate bot
December 16, 2024 23:46 9s renovate/redis-20.x
renovate/redis-20.x
December 16, 2024 23:46 9s
chore(deps): update helm release redis from 19.6.4 to v20 (helm/defectdojo/chart.yaml) Detect Merge Conflicts #22384: Pull request #10736 synchronize by renovate bot
December 16, 2024 23:46 12s
December 16, 2024 23:46 12s
Add generic OIDC login option Detect Merge Conflicts #22383: Pull request #10614 synchronize by dandersonsw
December 16, 2024 20:39 12s dandersonsw:add-oidc
dandersonsw:add-oidc
December 16, 2024 20:39 12s
Add generic OIDC login option Detect Merge Conflicts #22382: Pull request #10614 synchronize by dandersonsw
December 16, 2024 20:39 18s
December 16, 2024 20:39 18s
Bump nanoid from 3.3.7 to 3.3.8 in /docs Detect Merge Conflicts #22381: Pull request #11421 synchronize by dependabot bot
December 16, 2024 19:35 2m 11s dependabot/npm_and_yarn/docs/nanoid-3.3.8
dependabot/npm_and_yarn/docs/nanoid-3.3.8
December 16, 2024 19:35 2m 11s
Bump nanoid from 3.3.7 to 3.3.8 in /docs Detect Merge Conflicts #22380: Pull request #11421 synchronize by dependabot bot
December 16, 2024 19:35 2m 14s
December 16, 2024 19:35 2m 14s
Release: Merge back 2.41.2 into bugfix from: master-into-bugfix/2.41.2-2.42.0-dev Detect Merge Conflicts #22379: Pull request #11430 reopened by rossops
December 16, 2024 16:08 23s master-into-bugfix/2.41.2-2.42.0-dev
master-into-bugfix/2.41.2-2.42.0-dev
December 16, 2024 16:08 23s
Release: Merge back 2.41.2 into dev from: master-into-dev/2.41.2-2.42.0-dev Detect Merge Conflicts #22378: Pull request #11431 synchronize by rossops
December 16, 2024 16:07 16s master-into-dev/2.41.2-2.42.0-dev
master-into-dev/2.41.2-2.42.0-dev
December 16, 2024 16:07 16s
Release: Merge back 2.41.2 into dev from: master-into-dev/2.41.2-2.42.0-dev Detect Merge Conflicts #22377: Pull request #11431 synchronize by rossops
December 16, 2024 16:07 2m 12s
December 16, 2024 16:07 2m 12s
Release: Merge release into master from: release/2.41.2 Detect Merge Conflicts #22376: Pull request #11429 synchronize by rossops
December 16, 2024 15:30 11s release/2.41.2
release/2.41.2
December 16, 2024 15:30 11s
Release: Merge release into master from: release/2.41.2 Detect Merge Conflicts #22375: Pull request #11429 synchronize by rossops
December 16, 2024 15:30 11s
December 16, 2024 15:30 11s
Release: Merge release into master from: release/2.41.2 Detect Merge Conflicts #22374: Pull request #11429 reopened by rossops
December 16, 2024 15:30 14s release/2.41.2
release/2.41.2
December 16, 2024 15:30 14s
Bump pdfmake from 0.2.15 to 0.2.16 in /components Detect Merge Conflicts #22373: Pull request #11428 opened by dependabot bot
December 16, 2024 12:30 9s dependabot/npm_and_yarn/components/dev/pdfmake-0.2.16
dependabot/npm_and_yarn/components/dev/pdfmake-0.2.16
December 16, 2024 12:30 9s
chore(deps): update docker/setup-buildx-action action from v3.7.1 to v3.8.0 (.github/workflows/release-x-manual-docker-containers.yml) Detect Merge Conflicts #22372: Pull request #11427 opened by renovate bot
December 16, 2024 12:27 12s renovate/docker-setup-buildx-action-3.x
renovate/docker-setup-buildx-action-3.x
December 16, 2024 12:27 12s
Bump vobject from 0.9.8 to 0.9.9 Detect Merge Conflicts #22371: Pull request #11426 opened by dependabot bot
December 16, 2024 12:27 9s dependabot/pip/dev/vobject-0.9.9
dependabot/pip/dev/vobject-0.9.9
December 16, 2024 12:27 9s
Bump boto3 from 1.35.78 to 1.35.81 Detect Merge Conflicts #22370: Pull request #11425 opened by dependabot bot
December 16, 2024 12:27 10s dependabot/pip/dev/boto3-1.35.81
dependabot/pip/dev/boto3-1.35.81
December 16, 2024 12:27 10s
fix(deps): update dependency @tabler/icons from 3.24.0 to v3.26.0 (docs/package.json) Detect Merge Conflicts #22369: Pull request #11423 synchronize by renovate bot
December 15, 2024 21:33 10s renovate/tabler-icons-3.x-lockfile
renovate/tabler-icons-3.x-lockfile
December 15, 2024 21:33 10s
fix(deps): update dependency @tabler/icons from 3.24.0 to v3.26.0 (docs/package.json) Detect Merge Conflicts #22368: Pull request #11423 synchronize by renovate bot
December 15, 2024 21:33 12s
December 15, 2024 21:33 12s
fix(deps): update dependency @tabler/icons from 3.24.0 to v3.26.0 (docs/package.json) Detect Merge Conflicts #22367: Pull request #11423 opened by renovate bot
December 15, 2024 18:14 11s renovate/tabler-icons-3.x-lockfile
renovate/tabler-icons-3.x-lockfile
December 15, 2024 18:14 11s
bump ruff to 0.8.1 Detect Merge Conflicts #22366: Pull request #11350 synchronize by manuel-sommer
December 15, 2024 15:08 18s manuel-sommer:ruff_bump081
manuel-sommer:ruff_bump081
December 15, 2024 15:08 18s