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

10 files changed, 24 insertions, 37 deletions

diff --git a/CHANGELOG-EE.md b/CHANGELOG-EE.md
index 7bea16da4e6..4ec5e9c98fd 100644
--- a/CHANGELOG-EE.md
+++ b/CHANGELOG-EE.md
@@ -1,5 +1,12 @@
 Please view this file on the master branch, on stable branches it's out of date.
 
+## 12.7.1
+
+### Fixed (1 change)
+
+- Fix create/delete API calls for approval rules. !23107
+
+
 ## 12.7.0
 
 ### Removed (2 changes)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a70dc4b79a1..a147bd438b4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,22 @@
 documentation](doc/development/changelog.md) for instructions on adding your own
 entry.
 
+## 12.7.1
+
+### Fixed (6 changes)
+
+- Fix loading of sub-epics caused by wrong subscription check. !23184
+- Fix Bitbucket Server importer error handler. !23310
+- Fixes random passwords generated not conforming to minimum_password_length setting. !23387
+- Reverts MR diff redesign which fixes Web IDE visual bugs including file dropdown not showing up. !23428
+- Allow users to sign out on a read-only instance. !23545
+- Remove invalid data from jira_tracker_data table. !23621
+
+### Added (1 change)
+
+- Close Issue when resolving corresponding Sentry error. !22744
+
+
 ## 12.7.0
 
 ### Security (6 changes, 2 of them are from the community)
diff --git a/VERSION b/VERSION
index 13a10acf71c..93fe62ea720 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.7.0-ee
+12.7.1-ee
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/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