Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Syncs with upstream dev #94

Closed
wants to merge 27 commits into from

Conversation

inesmartins-swordhealth

No description provided.

DefectDojo release bot and others added 27 commits October 30, 2023 16:22
…28.0-dev

Release: Merge back 2.27.4 into bugfix from: master-into-bugfix/2.27.4-2.28.0-dev
…29.0-dev

Release: Merge back 2.28.0 into bugfix from: master-into-bugfix/2.28.0-2.29.0-dev
* Update versions in application files

* Removed git_protect GH action

* Add empty Dryrun Security file

* Bump boto3 from 1.28.77 to 1.28.79 (#8951)

Bumps [boto3](https://github.com/boto/boto3) from 1.28.77 to 1.28.79.
- [Release notes](https://github.com/boto/boto3/releases)
- [Changelog](https://github.com/boto/boto3/blob/develop/CHANGELOG.rst)
- [Commits](boto/boto3@1.28.77...1.28.79)

---
updated-dependencies:
- dependency-name: boto3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Update actions/setup-python action from v2 to v4 (.github/workflows/check-protected-files.yml) (#8946)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update actions/checkout action from v2 to v4 (.github/workflows/check-protected-files.yml) (#8945)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Try to fix odd merge conflict

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: DefectDojo release bot <[email protected]>
Co-authored-by: Cody Maffucci <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Testing the new actions
typo error in `dojo_ratelimit` function
Bumps [boto3](https://github.com/boto/boto3) from 1.28.82 to 1.28.84.
- [Release notes](https://github.com/boto/boto3/releases)
- [Changelog](https://github.com/boto/boto3/blob/develop/CHANGELOG.rst)
- [Commits](boto/boto3@1.28.82...1.28.84)

---
updated-dependencies:
- dependency-name: boto3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Release: Merge release into master from: release/2.28.1
…0-dev

Release: Merge back 2.28.1 into dev from: master-into-dev/2.28.1-2.29.0-dev
Bumps [celery](https://github.com/celery/celery) from 5.3.4 to 5.3.5.
- [Release notes](https://github.com/celery/celery/releases)
- [Changelog](https://github.com/celery/celery/blob/main/Changelog.rst)
- [Commits](celery/celery@v5.3.4...v5.3.5)

---
updated-dependencies:
- dependency-name: celery
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…submodule-update.yml) (#8985)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants