Merge branch 'master' of github.com:paritytech/substrate into kiz-off…

…chain-phragmen-4

.gitlab-ci.yml

@@ -365,16 +365,16 @@ check_warnings:
       - $DEPLOY_TAG
   variables:
     GIT_STRATEGY:                  none
-  dependencies:
-    - test-linux-stable
+  needs:
+    - job:                         test-linux-stable
+      artifacts:                   true
   script:
     - if [ -s ${CI_COMMIT_SHORT_SHA}_warnings.log ]; then
         cat ${CI_COMMIT_SHORT_SHA}_warnings.log;
         exit 1;
       else
         echo "___No warnings___";
       fi
-  allow_failure:                   true
 
 # Nightly check whether Polkadot 'master' branch builds.
 check_polkadot:

.maintain/gitlab/check_runtime.sh

@@ -54,9 +54,9 @@ fi
 # consensus-critical logic that has changed. the runtime wasm blobs must be
 # rebuilt.
 
-add_spec_version="$(git diff origin/master...${CI_COMMIT_SHA} ${VERSIONS_FILE} \
+add_spec_version="$(git diff tags/release...${CI_COMMIT_SHA} ${VERSIONS_FILE} \
 	| sed -n -r "s/^\+[[:space:]]+spec_version: +([0-9]+),$/\1/p")"
-sub_spec_version="$(git diff origin/master...${CI_COMMIT_SHA} ${VERSIONS_FILE} \
+sub_spec_version="$(git diff tags/release...${CI_COMMIT_SHA} ${VERSIONS_FILE} \
 	| sed -n -r "s/^\-[[:space:]]+spec_version: +([0-9]+),$/\1/p")"
 
 
@@ -79,9 +79,9 @@ else
 	# check for impl_version updates: if only the impl versions changed, we assume
 	# there is no consensus-critical logic that has changed.
 
-	add_impl_version="$(git diff origin/master...${CI_COMMIT_SHA} ${VERSIONS_FILE} \
+	add_impl_version="$(git diff tags/release...${CI_COMMIT_SHA} ${VERSIONS_FILE} \
 		| sed -n -r 's/^\+[[:space:]]+impl_version: +([0-9]+),$/\1/p')"
-	sub_impl_version="$(git diff origin/master...${CI_COMMIT_SHA} ${VERSIONS_FILE} \
+	sub_impl_version="$(git diff tags/release...${CI_COMMIT_SHA} ${VERSIONS_FILE} \
 		| sed -n -r 's/^\-[[:space:]]+impl_version: +([0-9]+),$/\1/p')"
 
 

.maintain/sentry-node/docker-compose.yml

@@ -26,6 +26,7 @@ services:
   validator-a:
     ports:
       - "9944:9944"
+      - "9615:9615"
     volumes:
       - ../../target/release/substrate:/usr/local/bin/substrate
     image: parity/substrate
@@ -58,6 +59,7 @@ services:
       - "--no-telemetry"
       - "--rpc-cors"
       - "all"
+      - "--prometheus-external"
 
   sentry-a:
     image: parity/substrate