Add latest changes from gitlab-org/security/gitlab@13-8-stable-eev13.8.8

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