summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-11-19 23:10:48 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-11-19 23:10:48 +0000
commit43e9756cf7f93d2a8b7b570033dda84b0a344086 (patch)
tree56dab5340e591d31a9c6cf6b9672957b2d2f85c4
parent8664e1240730f733a6a21f65333dbaa7f8f92781 (diff)
downloadgitlab-ce-43e9756cf7f93d2a8b7b570033dda84b0a344086.tar.gz
Add latest changes from gitlab-org/gitlab@12-5-stable-ee
-rw-r--r--VERSION2
-rwxr-xr-x[-rw-r--r--]vendor/gitignore/C++.gitignore0
-rwxr-xr-x[-rw-r--r--]vendor/gitignore/Java.gitignore0
3 files changed, 1 insertions, 1 deletions
diff --git a/VERSION b/VERSION
index 193a57332e9..da8bb8a442c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.5.0-rc42
+12.5.0-rc42-ee
diff --git a/vendor/gitignore/C++.gitignore b/vendor/gitignore/C++.gitignore
index 259148fa18f..259148fa18f 100644..100755
--- a/vendor/gitignore/C++.gitignore
+++ b/vendor/gitignore/C++.gitignore
diff --git a/vendor/gitignore/Java.gitignore b/vendor/gitignore/Java.gitignore
index a1c2a238a96..a1c2a238a96 100644..100755
--- a/vendor/gitignore/Java.gitignore
+++ b/vendor/gitignore/Java.gitignore