diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-20 13:28:59 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-20 13:28:59 +0000 |
commit | 24970d4affd41937f16ff10d3fc51a3705343574 (patch) | |
tree | 5764f86900a206842953d2f1bf64f9dcec75888a | |
parent | dba864470fbcbb6bdd5b94eb510acdce62c962d8 (diff) | |
download | gitlab-ce-24970d4affd41937f16ff10d3fc51a3705343574.tar.gz |
Add latest changes from gitlab-org/gitlab@12-8-stable-ee
-rw-r--r-- | GITALY_SERVER_VERSION | 2 | ||||
-rw-r--r-- | VERSION | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | vendor/gitignore/C++.gitignore | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | vendor/gitignore/Java.gitignore | 0 |
4 files changed, 2 insertions, 2 deletions
diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index 9eb3362c47a..f68ec413f0d 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -263fd270787f96f22d431a8e77dd1f2f4d254d96 +12.8.0-rc42 @@ -1 +1 @@ -12.7.0-pre +12.8.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 |