summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-01-21 17:20:26 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-01-21 17:20:26 +0000
commitddc3325c3cc692db50df0d18d863f06cfaedc597 (patch)
tree447ca061b596df46d802c7c48add045d6dd03a98
parentb2b12753e8ded0fd5c25b07573193f4b6eab2ca4 (diff)
downloadgitlab-ce-ddc3325c3cc692db50df0d18d863f06cfaedc597.tar.gz
Add latest changes from gitlab-org/gitlab@12-7-stable-ee
-rw-r--r--GITALY_SERVER_VERSION2
-rw-r--r--VERSION2
2 files changed, 2 insertions, 2 deletions
diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION
index 5ce1438f0dc..6b4de0a42b0 100644
--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
@@ -1 +1 @@
-ab228134ba71aef8782ef97bb8acc10da202381b
+1.83.0
diff --git a/VERSION b/VERSION
index 7ba0767b3f4..e0b93f60f61 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.7.0-rc42
+12.7.0-rc42-ee