summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-12-03 11:24:07 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-12-03 11:24:07 +0000
commit952e48941d51c2c2a506a003f92a8a0149dc8608 (patch)
tree822399d651b30d9d1475571240e220c2e991de6b
parent225d2e5bb899067bde3caedb1319d39c46d94dc0 (diff)
downloadgitlab-ce-952e48941d51c2c2a506a003f92a8a0149dc8608.tar.gz
Add latest changes from gitlab-org/gitlab@12-5-stable-ee
-rw-r--r--CHANGELOG-EE.md11
-rw-r--r--VERSION2
2 files changed, 12 insertions, 1 deletions
diff --git a/CHANGELOG-EE.md b/CHANGELOG-EE.md
index cc3f76b7960..3ee8fccc731 100644
--- a/CHANGELOG-EE.md
+++ b/CHANGELOG-EE.md
@@ -1,5 +1,16 @@
Please view this file on the master branch, on stable branches it's out of date.
+## 12.5.3
+
+### Performance (1 change)
+
+- Geo - Improve query performance to determine job artifacts to sync when selective sync is enabled. !19583
+
+### Other (1 change)
+
+- Geo - Does not schedule duplicated jobs while backfilling uploads, LFS objects and job artifacts. !20324
+
+
## 12.5.2
- No changes.
diff --git a/VERSION b/VERSION
index 321973ede3e..3d1f5e44281 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.5.3
+12.5.3-ee