Skip to content

Commit 3ef2e5d

Browse files
Merge upstream develop
2 parents 10b918b + ce4cfa7 commit 3ef2e5d

4 files changed

Lines changed: 266 additions & 244 deletions

File tree

.gitlab/ci/scan_dependencies.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
trivy:
22
stage: check
33
image:
4-
name: aquasec/trivy:0.71.0
4+
name: aquasec/trivy:0.71.1
55
entrypoint: ['']
66
rules:
77
- if: $CI_PIPELINE_SOURCE == "merge_request_event"

Cargo.lock

Lines changed: 6 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,5 @@ log = "0.4"
4343
# Pinned: 0.3.48 adds a `From` impl on an associated-type projection that
4444
# fails coherence (E0119) in sea-query and aws-smithy-types. Unpin once those
4545
# crates ship releases that compile against it.
46-
time = "=0.3.47"
46+
time = "=0.3.49"
4747
base64 = "0.22.1"

0 commit comments

Comments
 (0)