summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-06-04 09:24:15 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-06-04 09:24:15 +0000
commitec418a95dda09b3af41e9d1a8bc278566680bb38 (patch)
tree98d38ae644c8aa033ca96da144f274984edcfc18
parentf70eb0ef675ca06493f4a80d98c34adb935d76ed (diff)
downloadgitlab-ce-ec418a95dda09b3af41e9d1a8bc278566680bb38.tar.gz
Add latest changes from gitlab-org/gitlab@13-0-stable-ee
-rw-r--r--GITLAB_WORKHORSE_VERSION2
-rw-r--r--changelogs/unreleased/update-workhorse-version-13-0-ee.yml5
2 files changed, 6 insertions, 1 deletions
diff --git a/GITLAB_WORKHORSE_VERSION b/GITLAB_WORKHORSE_VERSION
index ffca1dc2418..594580cb92f 100644
--- a/GITLAB_WORKHORSE_VERSION
+++ b/GITLAB_WORKHORSE_VERSION
@@ -1 +1 @@
-8.31.1
+8.31.2
diff --git a/changelogs/unreleased/update-workhorse-version-13-0-ee.yml b/changelogs/unreleased/update-workhorse-version-13-0-ee.yml
new file mode 100644
index 00000000000..f48540627e3
--- /dev/null
+++ b/changelogs/unreleased/update-workhorse-version-13-0-ee.yml
@@ -0,0 +1,5 @@
+---
+title: Update GitLab Workhorse to v8.31.2
+merge_request: 33818
+author:
+type: other