diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-14 00:20:08 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-14 00:20:08 +0300 |
commit | b419abb3b4a8a0132345bfacc51a50018f35e5b0 (patch) | |
tree | d3f61c9e1dd0e5d7f2fde4d010b7d291d792b505 | |
parent | a867b9d6940eddd2e23f01420b964c6127fd8557 (diff) |
Add latest changes from gitlab-org/security/gitlab@13-8-stable-eev13.8.8
-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 | ||||
-rwxr-xr-x[-rw-r--r--] | vendor/gitignore/C++.gitignore | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | vendor/gitignore/Java.gitignore | 0 |
6 files changed, 9 insertions, 11 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 00bd2b1cce5..1fc2396c5b6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,14 @@ documentation](doc/development/changelog.md) for instructions on adding your own entry. +## 13.8.8 (2021-04-13) + +### Security (2 changes) + +- Clean only legitimate JPG and TIFF files. +- Update ruby-saml and rexml gems. + + ## 13.8.7 (2021-03-31) ### Security (5 changes) diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index b9e9613fd0b..5135d3d9994 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -13.8.7
\ No newline at end of file +13.8.8
\ 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 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 |