Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.3

8 files changed, 16 insertions, 31 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d2ecaa19b49..b676ddad5fa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,21 @@
 documentation](doc/development/changelog.md) for instructions on adding your own
 entry.
 
+## 13.6.3 (2020-12-10)
+
+### Fixed (5 changes)
+
+- Fix error 500s creating projects concurrently. !48571
+- Fix container_registry url for relative urls. !48661
+- Resolve Members page 500 error after Invitation sent via API. !48937
+- Add different string encoding method in rack middleware. !49044
+- Fix MR rendering issue when user is tool admin and not project member. !49258
+
+### Changed (1 change)
+
+- Update Rake check and docs to require Ruby 2.7. !48552
+
+
 ## 13.6.2 (2020-12-07)
 
 ### Security (10 changes)
diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION
index cf51d24272d..06a348286f5 100644
--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
@@ -1 +1 @@
-13.6.2
\ No newline at end of file
+13.6.3
\ No newline at end of file
diff --git a/changelogs/unreleased/285076-400-bad-request-during-authentication-due-to-password-format-lengt.yml b/changelogs/unreleased/285076-400-bad-request-during-authentication-due-to-password-format-lengt.yml
deleted file mode 100644
index a2dfc320f49..00000000000
--- a/changelogs/unreleased/285076-400-bad-request-during-authentication-due-to-password-format-lengt.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add different string encoding method in rack middleware
-merge_request: 49044
-author:
-type: fixed
diff --git a/changelogs/unreleased/288752-registry-details-relative-url-fix.yml b/changelogs/unreleased/288752-registry-details-relative-url-fix.yml
deleted file mode 100644
index 2d315d396ea..00000000000
--- a/changelogs/unreleased/288752-registry-details-relative-url-fix.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix container_registry url for relative urls
-merge_request: 48661
-author:
-type: fixed
diff --git a/changelogs/unreleased/290006-error-500-on-members-page-after-invitation-sent-via-api.yml b/changelogs/unreleased/290006-error-500-on-members-page-after-invitation-sent-via-api.yml
deleted file mode 100644
index 8d393e47a61..00000000000
--- a/changelogs/unreleased/290006-error-500-on-members-page-after-invitation-sent-via-api.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Resolve Members page 500 error after Invitation sent via API
-merge_request: 48937
-author:
-type: fixed
diff --git a/changelogs/unreleased/291160-merge-request-doesn-t-fully-render-when-user-is-a-tool-admin-if-no.yml b/changelogs/unreleased/291160-merge-request-doesn-t-fully-render-when-user-is-a-tool-admin-if-no.yml
deleted file mode 100644
index 654119b2342..00000000000
--- a/changelogs/unreleased/291160-merge-request-doesn-t-fully-render-when-user-is-a-tool-admin-if-no.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix MR rendering issue when user is tool admin and not project member
-merge_request: 49258
-author:
-type: fixed
diff --git a/changelogs/unreleased/sh-fix-issue-233862.yml b/changelogs/unreleased/sh-fix-issue-233862.yml
deleted file mode 100644
index 081c3574ec4..00000000000
--- a/changelogs/unreleased/sh-fix-issue-233862.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix error 500s creating projects concurrently
-merge_request: 48571
-author:
-type: fixed
diff --git a/changelogs/unreleased/sh-require-ruby-2-7.yml b/changelogs/unreleased/sh-require-ruby-2-7.yml
deleted file mode 100644
index 7f7465d5cac..00000000000
--- a/changelogs/unreleased/sh-require-ruby-2-7.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Update Rake check and docs to require Ruby 2.7
-merge_request: 48552
-author:
-type: changed