diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-13 21:31:16 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-13 21:31:16 +0000 |
| commit | c80628262aa87495d2b6146c22c03a236f28bd88 (patch) | |
| tree | 36ad4743d4b1a1cf1fe284cb143dd99e30bdb93e | |
| parent | 5ea927db6637ea7cb801533bc99194d5114286d9 (diff) | |
| download | gitlab-ce-c80628262aa87495d2b6146c22c03a236f28bd88.tar.gz | |
Add latest changes from gitlab-org/security/gitlab@13-9-stable-eev13.9.6
| -rw-r--r-- | CHANGELOG.md | 8 | ||||
| -rw-r--r-- | GITALY_SERVER_VERSION | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/security-327154-only-jpeg-tiff.yml | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/security-ruby-saml-auth-bypass-fix.yml | 5 | ||||
| -rw-r--r--[-rwxr-xr-x] | vendor/gitignore/C++.gitignore | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | vendor/gitignore/Java.gitignore | 0 |
6 files changed, 9 insertions, 11 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 629a092977f..0ac3dec21c8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,14 @@ documentation](doc/development/changelog.md) for instructions on adding your own entry. +## 13.9.6 (2021-04-13) + +### Security (2 changes) + +- Clean only legitimate JPG and TIFF files. +- Update ruby-saml and rexml gems. + + ## 13.9.5 (2021-03-31) ### Security (6 changes) diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index 62f8ce01fb6..c2273bba244 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -13.9.5
\ No newline at end of file +13.9.6
\ No newline at end of file diff --git a/changelogs/unreleased/security-327154-only-jpeg-tiff.yml b/changelogs/unreleased/security-327154-only-jpeg-tiff.yml deleted file mode 100644 index 1751bd735bf..00000000000 --- a/changelogs/unreleased/security-327154-only-jpeg-tiff.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Clean only legitimate JPG and TIFF files -merge_request: -author: -type: security diff --git a/changelogs/unreleased/security-ruby-saml-auth-bypass-fix.yml b/changelogs/unreleased/security-ruby-saml-auth-bypass-fix.yml deleted file mode 100644 index 6f7d3c809c7..00000000000 --- a/changelogs/unreleased/security-ruby-saml-auth-bypass-fix.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Update ruby-saml and rexml gems -merge_request: -author: -type: security 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 |