summaryrefslogtreecommitdiff
path: root/vendor
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-12-31 10:53:50 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-12-31 10:53:50 +0000
commit02434d0c9263461c6ee6b5d9f1a4b9c69db9db34 (patch)
tree012c8b8105c6c6dc2d0372dd03e78e28ada4ed64 /vendor
parent64b66e0cb6d1bfd27abf24e06653f00bddb60597 (diff)
downloadgitlab-ce-02434d0c9263461c6ee6b5d9f1a4b9c69db9db34.tar.gz
Add latest changes from gitlab-org/security/gitlab@12-5-stable-ee
Diffstat (limited to 'vendor')
-rw-r--r--[-rwxr-xr-x]vendor/gitignore/C++.gitignore0
-rw-r--r--[-rwxr-xr-x]vendor/gitignore/Java.gitignore0
2 files changed, 0 insertions, 0 deletions
diff --git a/vendor/gitignore/C++.gitignore b/vendor/gitignore/C++.gitignore
index 259148fa18f..259148fa18f 100755..100644
--- 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 100755..100644
--- a/vendor/gitignore/Java.gitignore
+++ b/vendor/gitignore/Java.gitignore