diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-13 08:42:05 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-13 08:42:05 +0000 |
| commit | 0dac5c5487f101fabb3eec89ccc34363282c41bc (patch) | |
| tree | a5632cf62b8ca51208b61702878f688e16607123 | |
| parent | ac5568eb5d8cef68ced7c70729cc47f20d0a84b9 (diff) | |
| download | gitlab-ce-0dac5c5487f101fabb3eec89ccc34363282c41bc.tar.gz | |
Add latest changes from gitlab-org/security/gitlab@12-9-stable-ee
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r--[-rwxr-xr-x] | vendor/gitignore/C++.gitignore | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | vendor/gitignore/Java.gitignore | 0 |
3 files changed, 0 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 197596031b8..d11761e0607 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,6 @@ entry. ## 12.9.2 (2020-03-31) -- No changes. ### Fixed (5 changes) - Ensure import by URL works after a failed import. !27546 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 |