Add latest changes from gitlab-org/gitlab@13-3-stable-eev13.3.8

8 files changed, 17 insertions, 21 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c5eae43f2cb..fe68016cbb3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,22 @@
 documentation](doc/development/changelog.md) for instructions on adding your own
 entry.
 
+## 13.3.8 (2020-10-21)
+
+### Fixed (2 changes)
+
+- Make SSH keys publicly accessible. !42288
+- Revert required encryption on CI runner tokens. !42623
+
+### Added (1 change)
+
+- Add missing fontawesome file icon classes. !43091
+
+### Other (1 change)
+
+- GitLab-managed apps: Use GitLab's repo as replacement for the Helm stable repo. !44875
+
+
 ## 13.3.7 (2020-10-01)
 
 ### Security (14 changes)
diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION
index b1afe3ebd6f..176df6ffec5 100644
--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
@@ -1 +1 @@
-13.3.7
+13.3.8
\ No newline at end of file
diff --git a/changelogs/unreleased/235756-ssh-public-keys-no-longer-public-accessible.yml b/changelogs/unreleased/235756-ssh-public-keys-no-longer-public-accessible.yml
deleted file mode 100644
index 2ccaf5d9eb1..00000000000
--- a/changelogs/unreleased/235756-ssh-public-keys-no-longer-public-accessible.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Make SSH keys publicly accessible
-merge_request: 42288
-author:
-type: fixed
diff --git a/changelogs/unreleased/254946-add-missing-fa-icons-for-file_type_icon_class.yml b/changelogs/unreleased/254946-add-missing-fa-icons-for-file_type_icon_class.yml
deleted file mode 100644
index 8ad7010c0ee..00000000000
--- a/changelogs/unreleased/254946-add-missing-fa-icons-for-file_type_icon_class.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add missing fontawesome file icon classes
-merge_request: 43091
-author:
-type: added
diff --git a/changelogs/unreleased/revert-a6875e5f.yml b/changelogs/unreleased/revert-a6875e5f.yml
deleted file mode 100644
index ea8135346f2..00000000000
--- a/changelogs/unreleased/revert-a6875e5f.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Revert required encryption on CI runner tokens
-merge_request: 42623
-author:
-type: fixed
diff --git a/changelogs/unreleased/use_mirror_of_helm_stable_repo.yml b/changelogs/unreleased/use_mirror_of_helm_stable_repo.yml
deleted file mode 100644
index 479ed48ce89..00000000000
--- a/changelogs/unreleased/use_mirror_of_helm_stable_repo.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: "GitLab-managed apps: Use GitLab's repo as replacement for the Helm stable repo"
-merge_request: 44875
-author:
-type: other
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