Merge branch 'master' into ao-lmdb

* master: separate docker image to build docs (#10543) fix(bump dependencies) (#10540) Fix max_gas (#10537)
openethereum · Mar 29, 2019 · 03ee4b7 · 03ee4b7
2 parents 229c93d + 4e2e88a
commit 03ee4b7
Show file tree

Hide file tree

Showing 3 changed files with 312 additions and 353 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -249,6 +249,7 @@ publish-awss3-release:
 
 publish-docs:
   stage:                            publish
+  image:                            parity/rust-parity-ethereum-docs:xenial
   only:
     - tags
   except:
@@ -258,4 +259,3 @@ publish-docs:
     - scripts/gitlab/publish-docs.sh
   tags:
     - linux-docker
-