Skip to content

Commit

Permalink
Merge branch 'master' into tcsc/idc-filter-permission-sets
Browse files Browse the repository at this point in the history
  • Loading branch information
tcsc authored Dec 10, 2024
2 parents 234cda7 + 7c1efaf commit 155d548
Show file tree
Hide file tree
Showing 269 changed files with 5,706 additions and 2,788 deletions.
34 changes: 30 additions & 4 deletions .github/workflows/dependency-review.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,40 @@ jobs:
# but because of the replace, the dependency cannot find the correct
# Teleport version.
allow-ghsas: 'GHSA-6xf3-5hp7-xqqg'
# IronRDP uses MIT/Apache-2.0 but slashes are not recognized by dependency review action
allow-dependencies-licenses: >-
pkg:cargo/ironrdp-core,
pkg:cargo/ironrdp-async,
pkg:cargo/ironrdp-connector,
pkg:cargo/ironrdp-pdu,
pkg:cargo/ironrdp-session,
pkg:cargo/ironrdp-svc,
pkg:cargo/ironrdp-tokio,
pkg:cargo/asn1-rs,
pkg:cargo/asn1-rs-derive,
pkg:cargo/asn1-rs-impl,
pkg:cargo/curve25519-dalek-derive,
pkg:cargo/der-parser,
pkg:cargo/icu_collections,
pkg:cargo/icu_locid,
pkg:cargo/icu_locid_transform,
pkg:cargo/icu_locid_transform_data,
pkg:cargo/icu_normalizer,
pkg:cargo/icu_normalizer_data,
pkg:cargo/icu_properties,
pkg:cargo/icu_properties_data,
pkg:cargo/icu_provider,
pkg:cargo/icu_provider_macros,
pkg:cargo/litemap,
pkg:cargo/ring,
pkg:cargo/sspi,
pkg:cargo/tokio-boring,
pkg:cargo/tokio-rustls,
pkg:cargo/asn1-rs,
pkg:cargo/asn1-rs-derive,
pkg:cargo/asn1-rs-impl,
pkg:cargo/der-parser,
pkg:cargo/writeable,
pkg:cargo/yoke,
pkg:cargo/yoke-derive,
pkg:cargo/zerofrom,
pkg:cargo/zerofrom-derive,
pkg:cargo/zerovec,
pkg:cargo/zerovec-derive,
pkg:npm/prettier
Loading

0 comments on commit 155d548

Please sign in to comment.