Add latest changes from gitlab-org/gitlab@12-9-stable-ee

10 files changed, 34 insertions, 37 deletions

diff --git a/CHANGELOG-EE.md b/CHANGELOG-EE.md
index 2d1ef56eb69..c570a5d2fdf 100644
--- a/CHANGELOG-EE.md
+++ b/CHANGELOG-EE.md
@@ -1,5 +1,19 @@
 Please view this file on the master branch, on stable branches it's out of date.
 
+## 12.9.2 (2020-03-31)
+
+### Fixed (4 changes)
+
+- Fix direct access to individual design on deprecated issue route. !27650
+- Fix error when viewing events from design notes on project activity page. !27840
+- Allow Seat Link to be disabled through configuration or admin toggle. !28015
+- Allow active_users param to be optional for SyncSeatLinkRequestWorker#perform. !28241
+
+### Changed (1 change)
+
+- Send active users for each day in seat link POST request. !27481
+
+
 ## 12.9.1 (2020-03-26)
 
 ### Security (1 change)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f5d55efc24a..d11761e0607 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,25 @@
 documentation](doc/development/changelog.md) for instructions on adding your own
 entry.
 
+## 12.9.2 (2020-03-31)
+
+### Fixed (5 changes)
+
+- Ensure import by URL works after a failed import. !27546
+- Fix issue/MR state not being preserved when importing a project using Project Import/Export. !27816
+- Leave upload Content-Type unchaged. !27864
+- Disable archive rate limit by default. !28264
+- Fix rake gitlab:setup failing on new installs. !28270
+
+### Changed (1 change)
+
+- Rename feature on the FE and locale.
+
+### Performance (1 change)
+
+- Index issues on sent_notifications table. !27034
+
+
 ## 12.9.1 (2020-03-26)
 
 ### Security (16 changes)
diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION
index 791e0253c1c..9db21723818 100644
--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
@@ -1 +1 @@
-12.9.1
+12.9.2
diff --git a/changelogs/unreleased/212264-gcs-job-log-is-stored-with-content-type-invalid-invalid.yml b/changelogs/unreleased/212264-gcs-job-log-is-stored-with-content-type-invalid-invalid.yml
deleted file mode 100644
index e6b9528780d..00000000000
--- a/changelogs/unreleased/212264-gcs-job-log-is-stored-with-content-type-invalid-invalid.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Leave upload Content-Type unchaged
-merge_request: 27864
-author:
-type: fixed
diff --git a/changelogs/unreleased/docs-rename-skip-outdated-jobs.yml b/changelogs/unreleased/docs-rename-skip-outdated-jobs.yml
deleted file mode 100644
index 2f11cbcc484..00000000000
--- a/changelogs/unreleased/docs-rename-skip-outdated-jobs.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Rename feature on the FE and locale
-merge_request:
-author:
-type: changed
diff --git a/changelogs/unreleased/georgekoltsov-fix-issues-mrs-state.yml b/changelogs/unreleased/georgekoltsov-fix-issues-mrs-state.yml
deleted file mode 100644
index 018a14121e4..00000000000
--- a/changelogs/unreleased/georgekoltsov-fix-issues-mrs-state.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Fix issue/MR state not being preserved when importing a project using Project
-  Import/Export
-merge_request: 27816
-author:
-type: fixed
diff --git a/changelogs/unreleased/issue_11391_2.yml b/changelogs/unreleased/issue_11391_2.yml
deleted file mode 100644
index c59ac2d9ae4..00000000000
--- a/changelogs/unreleased/issue_11391_2.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Index issues on sent_notifications table
-merge_request: 27034
-author:
-type: performance
diff --git a/changelogs/unreleased/sh-check-features-table-gitaly.yml b/changelogs/unreleased/sh-check-features-table-gitaly.yml
deleted file mode 100644
index e9ae3e89a08..00000000000
--- a/changelogs/unreleased/sh-check-features-table-gitaly.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix rake gitlab:setup failing on new installs
-merge_request: 28270
-author:
-type: fixed
diff --git a/changelogs/unreleased/sh-disable-archive-rate-throttle-default.yml b/changelogs/unreleased/sh-disable-archive-rate-throttle-default.yml
deleted file mode 100644
index f9786f4e388..00000000000
--- a/changelogs/unreleased/sh-disable-archive-rate-throttle-default.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Disable archive rate limit by default
-merge_request: 28264
-author:
-type: fixed
diff --git a/changelogs/unreleased/sh-fix-import-by-url-retries.yml b/changelogs/unreleased/sh-fix-import-by-url-retries.yml
deleted file mode 100644
index b66026f4891..00000000000
--- a/changelogs/unreleased/sh-fix-import-by-url-retries.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Ensure import by URL works after a failed import
-merge_request: 27546
-author:
-type: fixed