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

9 files changed, 12 insertions, 26 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b1ca8236840..72177fdb5d4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,17 @@
 documentation](doc/development/changelog.md) for instructions on adding your own
 entry.
 
+## 13.8.2 (2021-02-01)
+
+### Security (5 changes)
+
+- Filter sensitive GraphQL variables from logs.
+- Avoid exposing release links when the user cannot read git-tag/repository.
+- Sanitize target branch on MR page.
+- Fix DNS rebinding protection bypass when allowing an IP address in Outbound Requests setting.
+- Add routes for unmatched url for not-get requests.
+
+
 ## 13.8.1 (2021-01-26)
 
 ### Fixed (3 changes)
diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION
index c90a2e8b7db..f65295bad83 100644
--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
@@ -1 +1 @@
-13.8.1
\ No newline at end of file
+13.8.2
\ No newline at end of file
diff --git a/changelogs/unreleased/security-filter-graphql-logs.yml b/changelogs/unreleased/security-filter-graphql-logs.yml
deleted file mode 100644
index 2c70c480289..00000000000
--- a/changelogs/unreleased/security-filter-graphql-logs.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Filter sensitive GraphQL variables from logs
-merge_request:
-author:
-type: security
diff --git a/changelogs/unreleased/security-guest-can-read-tag-from-releases.yml b/changelogs/unreleased/security-guest-can-read-tag-from-releases.yml
deleted file mode 100644
index a3b9b21d90a..00000000000
--- a/changelogs/unreleased/security-guest-can-read-tag-from-releases.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Avoid exposing release links when the user cannot read git-tag/repository
-merge_request:
-author:
-type: security
diff --git a/changelogs/unreleased/security-sanitize-target-branch.yml b/changelogs/unreleased/security-sanitize-target-branch.yml
deleted file mode 100644
index 9cf07fbfca4..00000000000
--- a/changelogs/unreleased/security-sanitize-target-branch.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Sanitize target branch on MR page
-merge_request:
-author:
-type: security
diff --git a/changelogs/unreleased/security-ssrf-outbound-request.yml b/changelogs/unreleased/security-ssrf-outbound-request.yml
deleted file mode 100644
index e67360fdbbf..00000000000
--- a/changelogs/unreleased/security-ssrf-outbound-request.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix DNS rebinding protection bypass when allowing an IP address in Outbound Requests setting
-merge_request:
-author:
-type: security
diff --git a/changelogs/unreleased/secutity-404-difference.yml b/changelogs/unreleased/secutity-404-difference.yml
deleted file mode 100644
index 0c09f2da9df..00000000000
--- a/changelogs/unreleased/secutity-404-difference.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add routes for unmatched url for not-get requests
-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