Merge remote-tracking branch 'dev/13-0-stable' into 13-0-stable

e3ac6e70 · GitLab Release Tools Bot · ef97506d · 12f657f4 · e3ac6e70 · e3ac6e70
隐藏空白更改
内联并排

Showing with 11 addition and 3 deletion

CHANGELOG.md CHANGELOG.md +8 -0

GITALY_SERVER_VERSION GITALY_SERVER_VERSION +1 -1

VERSION VERSION +1 -1

qa/Dockerfile qa/Dockerfile +1 -1

未找到文件。
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,14 @@
 documentation](doc/development/changelog.md) for instructions on adding your own
 entry.

+## 13.0.12 (2020-08-05)
+
+- No changes.
+
+## 13.0.11 (2020-08-05)
+
+This version has been skipped due to packaging problems.
+
 ## 13.0.10 (2020-07-09)

 ### Fixed (1 change)

--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
-13.0.10
+13.0.12
--- a/VERSION
+++ b/VERSION
-13.0.10
+13.0.12
--- a/qa/Dockerfile
+++ b/qa/Dockerfile
@@ -42,7 +42,7 @@ RUN unzip chromedriver_linux64.zip -d /usr/local/bin
 # Install K3d local cluster support
 #   https://github.com/rancher/k3d
 #
-RUN curl -s https://raw.githubusercontent.com/rancher/k3d/master/install.sh | TAG=v1.3.4 bash
+RUN curl -s https://raw.githubusercontent.com/rancher/k3d/main/install.sh | TAG=v1.3.4 bash

 ##
 # Install gcloud and kubectl CLI used in Auto DevOps test to create K8s