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

6 files changed, 17 insertions, 16 deletions

diff --git a/CHANGELOG-EE.md b/CHANGELOG-EE.md
index 454eb38f937..55467bb7491 100644
--- a/CHANGELOG-EE.md
+++ b/CHANGELOG-EE.md
@@ -1,5 +1,9 @@
 Please view this file on the master branch, on stable branches it's out of date.
 
+## 12.5.5
+
+- No changes.
+
 ## 12.5.4
 
 ### Security (1 change)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2ac03f4eb08..8b104d77bb4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,18 @@
 documentation](doc/development/changelog.md) for instructions on adding your own
 entry.
 
+## 12.5.5
+
+### Security (1 change)
+
+- Upgrade Akismet gem to v3.0.0. !21786
+
+### Fixed (2 changes)
+
+- Fix error in updating runner session. !20902
+- Fix Asana integration. !21501
+
+
 ## 12.5.4
 
 ### Security (1 change)
diff --git a/VERSION b/VERSION
index ad9a81ffeaa..af26d7bc8bc 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.5.4-ee
+12.5.5-ee
diff --git a/changelogs/unreleased/sh-fix-asana-integration.yml b/changelogs/unreleased/sh-fix-asana-integration.yml
deleted file mode 100644
index 34c2f9f48e1..00000000000
--- a/changelogs/unreleased/sh-fix-asana-integration.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix Asana integration
-merge_request: 21501
-author:
-type: fixed
diff --git a/changelogs/unreleased/sh-fix-issue-34366.yml b/changelogs/unreleased/sh-fix-issue-34366.yml
deleted file mode 100644
index efc19f8392e..00000000000
--- a/changelogs/unreleased/sh-fix-issue-34366.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix error in updating runner session
-merge_request: 20902
-author:
-type: fixed
diff --git a/changelogs/unreleased/sh-upgrade-akismet-gem.yml b/changelogs/unreleased/sh-upgrade-akismet-gem.yml
deleted file mode 100644
index c6a545e2bba..00000000000
--- a/changelogs/unreleased/sh-upgrade-akismet-gem.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Upgrade Akismet gem to v3.0.0
-merge_request: 21786
-author:
-type: security