Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

Commit d3d5b5f

Browse files
committed
Merge branch 'master' into bernhard-malus-fx-zombienet
* master: (38 commits) Replicate Rob's PR (#4337) Companion for Taskmanager: Remove `clean_shutdown` (#4336) prefer code upgrades in inherent filtering (#4334) remove provisioner checks (#4254) Log para inherent inputs (#4331) Dispute spam protection (#4134) Dependabot: Ignore sub-tokens (#4328) export hrmp config (#4324) Add missing license header (#4321) Use non-empty validation code (#4322) fix pallet-xcm extrinsic doc comments (#4317) prepare worker: Catch unexpected unwinds (#4304) Enable BEEFY explicitly (#4320) Bump serde_json from 1.0.70 to 1.0.71 (#4316) Bump strum from 0.22.0 to 0.23.0 (#4308) Remove sort_unstable_by (#4314) Bump tokio from 1.13.0 to 1.14.0 (#4298) Substrate companion: Authority discovery multiple peer ids (#4295) Companion for substrate#9878 (#3949) move paras inherent filtering to runtime (#4028) ...
2 parents d8f56d6 + cd9929f commit d3d5b5f

File tree

218 files changed

+9819
-5049
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

218 files changed

+9819
-5049
lines changed

.github/dependabot.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,6 @@ updates:
1616
- dependency-name: "try-runtime-*"
1717
- dependency-name: "test-runner"
1818
- dependency-name: "generate-bags"
19+
- dependency-name: "sub-tokens"
1920
schedule:
2021
interval: "daily"

.gitlab-ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@ cargo-fmt:
158158
<<: *docker-env
159159
<<: *rules-test
160160
script:
161+
- cargo +nightly --version
161162
- cargo +nightly fmt --all -- --check
162163
allow_failure: true
163164

0 commit comments

Comments
 (0)