Add latest changes from gitlab-org/gitlab@master

9 files changed, 10 insertions, 36 deletions

diff --git a/changelogs/unreleased/197925-setting-minimum-password-length-breaks-sign-up-with-saml.yml b/changelogs/unreleased/197925-setting-minimum-password-length-breaks-sign-up-with-saml.yml
deleted file mode 100644
index 0530fd88749..00000000000
--- a/changelogs/unreleased/197925-setting-minimum-password-length-breaks-sign-up-with-saml.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fixes random passwords generated not conforming to minimum_password_length setting
-merge_request: 23387
-author:
-type: fixed
diff --git a/changelogs/unreleased/198030-fix-wrong-data.yml b/changelogs/unreleased/198030-fix-wrong-data.yml
deleted file mode 100644
index d18203cdfef..00000000000
--- a/changelogs/unreleased/198030-fix-wrong-data.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Remove invalid data from jira_tracker_data table
-merge_request: 23621
-author:
-type: fixed
diff --git a/changelogs/unreleased/198289-unable-to-sign-out-from-secondary-geo-node.yml b/changelogs/unreleased/198289-unable-to-sign-out-from-secondary-geo-node.yml
deleted file mode 100644
index ac8db19b2c4..00000000000
--- a/changelogs/unreleased/198289-unable-to-sign-out-from-secondary-geo-node.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Allow users to sign out on a read-only instance
-merge_request: 23545
-author:
-type: fixed
diff --git a/changelogs/unreleased/33257-prevent-accidental-deletions-via-soft-delete-for-groups-api.yml b/changelogs/unreleased/33257-prevent-accidental-deletions-via-soft-delete-for-groups-api.yml
new file mode 100644
index 00000000000..769d1192f6d
--- /dev/null
+++ b/changelogs/unreleased/33257-prevent-accidental-deletions-via-soft-delete-for-groups-api.yml
@@ -0,0 +1,5 @@
+---
+title: Add API endpoints for 'soft-delete for groups' feature
+merge_request: 19430
+author:
+type: added
diff --git a/changelogs/unreleased/39825-close-issue-after-error-resolve.yml b/changelogs/unreleased/39825-close-issue-after-error-resolve.yml
deleted file mode 100644
index 9a59c812290..00000000000
--- a/changelogs/unreleased/39825-close-issue-after-error-resolve.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Close Issue when resolving corresponding Sentry error
-merge_request: 22744
-author:
-type: added
diff --git a/changelogs/unreleased/jprovazn-fix-group-preloader.yml b/changelogs/unreleased/jprovazn-fix-group-preloader.yml
deleted file mode 100644
index b2211fb81af..00000000000
--- a/changelogs/unreleased/jprovazn-fix-group-preloader.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix loading of sub-epics caused by wrong subscription check.
-merge_request: 23184
-author:
-type: fixed
diff --git a/changelogs/unreleased/revert-22364.yml b/changelogs/unreleased/revert-22364.yml
deleted file mode 100644
index 2b2d066adab..00000000000
--- a/changelogs/unreleased/revert-22364.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Reverts MR diff redesign which fixes Web IDE visual bugs including file dropdown
-  not showing up
-merge_request: 23428
-author:
-type: fixed
diff --git a/changelogs/unreleased/sh-add-missing-backtrace-define.yml b/changelogs/unreleased/sh-add-missing-backtrace-define.yml
deleted file mode 100644
index fd07321d012..00000000000
--- a/changelogs/unreleased/sh-add-missing-backtrace-define.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix Bitbucket Server importer error handler
-merge_request: 23310
-author:
-type: fixed
diff --git a/changelogs/unreleased/sh-optimize-runners-admin-show.yml b/changelogs/unreleased/sh-optimize-runners-admin-show.yml
new file mode 100644
index 00000000000..2222f622a6f
--- /dev/null
+++ b/changelogs/unreleased/sh-optimize-runners-admin-show.yml
@@ -0,0 +1,5 @@
+---
+title: Optimize page loading of Admin::RunnersController#show
+merge_request: 23309
+author:
+type: performance