summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-01-21 14:34:42 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-01-21 14:34:42 +0000
commit149e7fef0dc5ec12347dd2fce5cf852c9c5e5b98 (patch)
tree9e98e534beb490735b2c71eb6ff29328f3c303ce
parentcb0d23c455b73486fd1015f8ca9479b5b7e3585d (diff)
downloadgitlab-ce-149e7fef0dc5ec12347dd2fce5cf852c9c5e5b98.tar.gz
Add latest changes from gitlab-org/gitlab@12-7-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 158cd7e61ba..e0b93f60f61 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.7.0-pre
+12.7.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